Merge branch 'mb/local-clone-after-applying-insteadof'