Merge remote-tracking branch 'origin/main' into feat/m136-live-connector-proof-followup