Done in https://github.com/cms-sw/cmssw/pull/44067 14_0_X backport in https://github.com/cms-sw/cmssw/pull/44272