CLEANUP_OPTIONS: Sanitize directory inputs
Merge branch 'work'
Resolve merge conflict