PR: 70361 Submitted by: skv
directories safely. PR: 25767 Submitted by: Johann Visagie <johann@egenetics.com>