Merge branch 'hotfix/fix_javascript_crashes'
Merge branch 'hotfix/bug_fix' into develop