Merge branch 'ar/merge-recursive'