MiniAOD part 3 (7.2.X clone of the 7.1.X PR)

Clone of #3875 as requested in the comments of that PR