Merge branch 'features/JAL-2758_shorteruniprot' into develop