Code

Merge branch 'js/maint-add-path-stat-pwd' into maint