Merge branch 'js/pwd-var-vs-pwd-cmd-fix'