Merge branch 'en/merge-recursive-skip-fix'