Merge branch 'sb/clone-shallow-passthru' into maint