Merge remote-tracking branch 'origin/main' into 1128-osba-ext-output-wrong-for-foa-hoa2-inputs