Merge "Reland "Add columns for color aspects to database"""