Merge "Annotate different parts of the contributions UI with classes"