Gauss: the variant of MR 318 for master branch

This is a variant of !318 (merged) for master branch and replaces !322 (closed) that had merge conflicts.

Corresponds to merge request !318 (merged) into 'Sim09' and !321 (merged) into 'Sim09-upgrade'

Details at LHCBGAUSS-1437