Merge branch 'hotfix/1.17.6' into stable
1.17.7
jruby-1.7.2
Merge branch 'hotfix/1.17.7'