Merge branch 'ab/make-clean-depend-dirs' into maint