JAL-3210 merging in Jalview-JS/develop