fixing bugs #67473 and #67275 and changing defaults to avoid bug #66429
drwxr-xr-x - trunk