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.
f0f472d9bf7887e3da0a3b2950dc51b97568c0cd