Merge branch 'main' into claude/testing-strategy-review-j6wr1r

Author: hyperpolymath