Merge "Fix shallow clone behavior"