Make some working directory updates.
Updated comment (no change)
Merge branch 'improve_working_directory_feature'