Merge remote-tracking branch 'origin/backup/feat-q2-1-nontruncatable-wip-2026-05-18'

Author: hyperpolymath