Merge branch 'js/c-merge-recursive'