Merge branch 'features/JAL-1264_showHideAnnotations' into forpush/JAL-674_dssp