Merge branch 'Jalview-BH/JAL-3026' into feature/JAL-3144noJTree