Merge branch 'features/JAL-2432_annotbypercent' into develop