Preparation for SRB Gerrit review

Please use this PR for review, or the branch to push any changes.

We'll squash any commits later on into 2 target commits.
I made some changes to make the patch more local. Hope it'll work out during testing.