Merge branch '2924_preserve_dir_attributes' into 4.8.1-stable