Merge branch 'js/am-3-merge-recursive-direct'