Merge branch 'main' into fhg/fix-missing-gain-bed-application-in-osba-with-object-editing