Merge branch 'hotfix/LINE-39-ERR' into develop
Merge branch 'release/0.2'