Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB