update to changes required by LHCb!2617 (merged)
must be applied in conjunction with LHCb!2617 (merged)