Add dyn_gw interval patch from #3102