Merge branch 'js/remote-add-with-insteadof'