Merge branch 'Jalview-BH/JAL-3026' into Jalview-BH/JAL-3048_dialogs