Merge branch '6433-safe-delete-warning' into 'develop'

Avoid a warning is the dir does not exist

Closes #6433

See merge request !1677
1 job for develop
in 11 seconds and was queued for 4 seconds