Merge branch 'develop' into features/JAL-1912_biojson-per-sequence-annotation