Merge branch 'main' into self-test-evs-followup