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