Merge branch 'hotfix/2.1.7'
Merge remote-tracking branch 'origin/master' into develop