Merge branch 'en/keep-cwd'