Merge branch 'ds/partial-clone-fixes'