core-9 multiple repos, part 2

pull request created just so Jenkins has something to build... PR title will be adapted as soon as code is in a better state.