Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1