Backport of !596 (merged) for Sim09
!596 (merged) includes some clean up (e.g. use of Gaudi::Property) that I didn't include here to be conservative, but I may add them in next iterations.
Gaudi::Property
CC @roiser, @gcorti