Merge branch 'fa/merge-recursive-no-rename'