Merge branch 'hotfix-2.2.17'
Merge branch 'hotfix-2.2.18' into develop