Merge branch 'JAL-1551_2_11_3_spotlett' into features/JAL-4134_use_annotation_row_for...