Adding port forwarding back in
Merge branch 'hotfix-portforwarding'