Merge branch 'develop' into feature/r2_11_2/JAL-3808_gff2_exonerate