Merge branch 'release/0.18'
Merge branch 'hotfix/0.18.1' into develop