Merge branch 'working-dir-changes'