Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1