Merge "Remove directoryCopy state"