This change set should account for varying particle multiplicities in single-particle-gun-type setups with decaying particles.
Hi @chays, would you mind merging this one while @ewelina is on holidays? (We only need this in a Nightly for now.)