Merge "Base commit for service layer for repo diff tooling"