As requested by @tadej this splits out the EvtIdModifierSvc change from !65075 (merged).
EvtIdModifierSvc