Merge in RED/ui from RED-1178 to master * commit '6e271b884494e91e92aef410182ad3744b78a24d': Annotation list fixes