Merge branch 'bug/JAL-2757_uniprotftsbadquery' into develop