Merge branch 'js/maint-merge-recursive-r-d-conflict'