Merge branch 'develop'
Release: v1.18
Merge branch 'master' into develop