Merge branch 'ps/new-workdir-into-empty-directory'