Changes to support the repo clone rework