Merge remote-tracking branch 'remotes/origin/main' into 833-jbm-osba-the-gains-for-the-discrete-objects-are-not-computed