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