Merge "Change addCategoryLinks() to use array_fill_keys"