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.
It is indeed a possibility (and I agree about the fact that it's not the proper way to do things).
I have to ehck whether this line could not be removed altogether.