Merge remote-tracking branch 'remotes/origin/main' into 983-discrete-ism-gain-calculation-not-done-on-the-correct-number-of-objects