Merge branch 'js/exec-error-report'