Fixes to multiplicity changing chains

Tomasz Boldrequested to merge
tbold/athena:emu-chain-fix into master

Fix emulation test chain. Discussion in ATR-23051

Edited by Tomasz Bold

Merge request reports