Merge remote-tracking branch 'origin/main' into 2139-edited-object-gains-not-evaluated-in-the-ism-gain-calculation
