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.
Consider reworking to reduce nesting.