Merge branch 'windows-port-forwarding-fix' into stable