cherry pick MR !528 (merged) for 'Sim09' into 'master' and fix conflicts
Closes LHCB-1857
It consists of commits: