Merge branch 'develop' into alpha/JAL-3362_Jalview_212_alpha