See https://github.com/cms-sw/cmssw/pull/40690#discussion_r1096102877 Done in - [x] https://github.com/cms-sw/cmssw/pull/40792 - [x] https://github.com/cms-sw/cmssw/pull/40826