Merge branch 'hotfix/0.2.18'