Merge branch 'cherry-pick-15e37f31-master' into 'master'

Sweeping !46600 from 22.0-mc20 to master.
Fix bug in MergeTruthJetsTool where only the first event from each bunch-crossing was checked.

See merge request !46616

Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.cxx

@@ -48,7 +48,7 @@ StatusCode MergeTruthJetsTool::processBunchXing(int bunchXing,
   while (iEvt != eSubEvents) {
     const xAOD::JetContainer* inputJetContainer(nullptr);
     if (m_pMergeSvc->retrieveSingleSubEvtData(m_inputJetCollKey, inputJetContainer,
-                                              bunchXing, bSubEvents).isSuccess()) {
+                                              bunchXing, iEvt).isSuccess()) {
       ATH_MSG_VERBOSE("Found an xAOD::JetContainer in storeGate.");
       if ( !inputJetContainer ) {
         ATH_MSG_ERROR("Unable to retrieve input jet container: " << m_inputJetCollKey);