Merge branch 'feature/JAL-3180colourAnnotationMenu' into merge/JAL-3180