Merge branch 'mk/make-rm-depdirs-could-be-empty'