Merge "Fix category column count regression"