Move test route and firewall for test only.
Merge branch 'release/2.4.2'