Release 1.0.17.4
Merge branch 'develop'