Merge branch 'fix-init-pwd'
Merge branch 'master' into fix-init-pwd