This follows Rec!1831 (closed) and LHCb!2257 (closed) and Brunel!923 (closed)
This MR supersedes !333 (closed)