Merge branch 'bug/JAL-3529_uniprotidsinstockholm' into develop