Merge branch '2924_preserve_dir_attributes'