Merge branch 'en/merge-recursive' into next