Merge branch 'hotfix/2.1.16'
Fix typo.
Merge branch 'hotfix/2.1.17' into develop