Merge branch 'main' into...

Merge branch 'main' into 983-discrete-ism-gain-calculation-not-done-on-the-correct-number-of-objects