Merge branch 'main' into 20260304_cleanup