Merge "Scenario test for port forwarding"