Merge branch 'sp/sh-windows-pwd'