Merge branch 'JAL-1161_optimisingAnnotationPanel' into develop