Merge branch 'hotfix'
Merge branch 'develop'
Release: v1.16
Merge branch 'master' into develop