Merge branch 'hotfix/grammar'
Merge branch 'release/v0.5'