Old: charlie/codex-generic-base-validation (merge base) b29cfb15 → New: 29147/merge 594c24f7