Old: brent/update-preview-category-defaults (merge base) 79a825e2 → New: 28049/merge 7220f2dc