Merge branch 'js/exec-path-coverity-workaround' into maint