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.
I wanted to avoid returning things if the decorated function did not return anything, but indeed, it should be the same by returning None.