Code

Merge branch 'ar/clean-rmdir-empty'