Merge branch 'main' into 39-also-trigger-plc-in-smoke-test