Merge "Make RepoGroup a service instead of singleton"