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