Merge branch 'main' into add-plc-conditions-for-OSBA-in-self-test