add gateway 7001 support patch from #1918