Merge branch 'develop' into spike/JAL-1950_hmmer3client