Merge branch 'main' into opt/verified-wins