Merge branch 'features/JAL-2503_filteronquantitativeannotation' into develop