Merge branch 'hotfix/0.2.18' into develop
Merge branch 'master' into develop
Merge branch 'develop'