Merge branch 'js/maint-clone-insteadof'