Merge branch 'hotfix/1.21.10'
improve detecting port_root in case it is linked in rvm/bin, fix #2037
1.21.11
Merge branch 'master' into hotfix/1.21.11
Merge branch 'hotfix/1.21.11' into stable