Merge branch 'hotfix/parse_error_fix'
Merge branch 'develop'