Merge branch 'kw/merge-recursive-cleanup'