Merge branch 'JAL-674_fixannotlabels' into develop