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