Merge branch 'alpha/merge_212_JalviewJS_2112' into spike/JAL-3622_Scanner_swingjs_J21...