Merge remote-tracking branch 'origin/alpha/JAL-3066_Jalview_212_slivka-integration...