Merge branch 'hotfix/2.1.17'
Still fixing doc typo.
Merge branch 'hotfix/2.1.18' into develop