Reviewed-on: #1 Co-authored-by: Edward Wall <edward.wall@psi.ch> Co-committed-by: Edward Wall <edward.wall@psi.ch>