Merge branch 'sb/more-repo-in-api'