Merge "Fix handling categorization changes"