Merge origin/alpha into opts-refactor

No fixes have been suggested for this run group yet. See the Self-Healing CI docs for how fixes are suggested.