Done in - [x] master https://github.com/cms-sw/cmssw/pull/40849 - [x] 13_0_X https://github.com/cms-sw/cmssw/pull/40935