Merge branch 'hotfix/0.1.6.2' into develop