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