Merge branch 'js/maint-clone-insteadof' into maint