Various fixes around safe.directory
#3791
+75
−7
Merged
safe.directory
#3791