From ca1f63cff327680705d0ef45803fccf04a244af2 Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Thu, 7 Sep 2023 15:58:47 +0400
Subject: [PATCH 1/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859

---
 src/question_checkbox.ts               | 55 ++++++++++++++++++++++--
 src/question_radiogroup.ts             | 58 +++++++++++++++++++++++---
 src/react/reactquestion_checkbox.tsx   |  8 ++--
 src/react/reactquestion_radiogroup.tsx |  6 ++-
 4 files changed, 114 insertions(+), 13 deletions(-)

diff --git a/src/question_checkbox.ts b/src/question_checkbox.ts
index 7a5aabba11..e2953f60ce 100644
--- a/src/question_checkbox.ts
+++ b/src/question_checkbox.ts
@@ -39,9 +39,6 @@ export class QuestionCheckboxModel extends QuestionCheckboxBase {
   protected getDefaultItemComponent(): string {
     return "survey-checkbox-item";
   }
-  public get ariaRole(): string {
-    return "listbox";
-  }
   public getType(): string {
     return "checkbox";
   }
@@ -580,6 +577,58 @@ export class QuestionCheckboxModel extends QuestionCheckboxBase {
   public get checkBoxSvgPath(): string {
     return "M5,13l2-2l3,3l7-7l2,2l-9,9L5,13z";
   }
+
+  //a11y
+  public get titleAriaLabel(): string | null {
+    return null;
+  }
+
+  public get ariaRole(): string {
+    return null;
+  }
+  public get ariaRequired():any {
+    return null;
+  }
+  public get ariaInvalid():any {
+    return null;
+  }
+  public get ariaLabel(): string {
+    return null;
+  }
+  public get ariaLabelledBy(): string {
+    return null;
+  }
+  public get ariaDescribedBy(): string {
+    return null;
+  }
+
+  public get a11y_input_ariaRole(): string {
+    return "listbox";
+  }
+  public get a11y_input_ariaRequired(): "true" | "false" {
+    return this.isRequired ? "true" : "false";
+  }
+  public get a11y_input_ariaInvalid(): "true" | "false" {
+    return this.errors.length > 0 ? "true" : "false";
+  }
+  public get a11y_input_ariaLabel(): string {
+    if (this.hasTitle) {
+      return null;
+    } else {
+      return this.locTitle.renderedHtml;
+    }
+  }
+  public get a11y_input_ariaLabelledBy(): string {
+    if (this.hasTitle) {
+      return this.ariaTitleId;
+    } else {
+      return null;
+    }
+  }
+  public get a11y_input_ariaDescribedBy(): string {
+    return this.errors.length > 0 ? this.id + "_errors" : null;
+  }
+  // EO a11y
 }
 Serializer.addClass(
   "checkbox",
diff --git a/src/question_radiogroup.ts b/src/question_radiogroup.ts
index 50d0eb72f0..a15c097c6e 100644
--- a/src/question_radiogroup.ts
+++ b/src/question_radiogroup.ts
@@ -22,12 +22,6 @@ export class QuestionRadiogroupModel extends QuestionCheckboxBase {
     return "radiogroup";
   }
 
-  public get ariaRole(): string {
-    return "radiogroup";
-  }
-  public get titleAriaLabel(): string | null {
-    return null;
-  }
   protected getFirstInputElementId(): string {
     return this.inputId + "_0";
   }
@@ -83,6 +77,58 @@ export class QuestionRadiogroupModel extends QuestionCheckboxBase {
     }
     return actions;
   }
+
+  //a11y
+  public get titleAriaLabel(): string | null {
+    return null;
+  }
+
+  public get ariaRole(): string {
+    return null;
+  }
+  public get ariaRequired():any {
+    return null;
+  }
+  public get ariaInvalid():any {
+    return null;
+  }
+  public get ariaLabel(): string {
+    return null;
+  }
+  public get ariaLabelledBy(): string {
+    return null;
+  }
+  public get ariaDescribedBy(): string {
+    return null;
+  }
+
+  public get a11y_input_ariaRole(): string {
+    return "radiogroup";
+  }
+  public get a11y_input_ariaRequired(): "true" | "false" {
+    return this.isRequired ? "true" : "false";
+  }
+  public get a11y_input_ariaInvalid(): "true" | "false" {
+    return this.errors.length > 0 ? "true" : "false";
+  }
+  public get a11y_input_ariaLabel(): string {
+    if (this.hasTitle) {
+      return null;
+    } else {
+      return this.locTitle.renderedHtml;
+    }
+  }
+  public get a11y_input_ariaLabelledBy(): string {
+    if (this.hasTitle) {
+      return this.ariaTitleId;
+    } else {
+      return null;
+    }
+  }
+  public get a11y_input_ariaDescribedBy(): string {
+    return this.errors.length > 0 ? this.id + "_errors" : null;
+  }
+  // EO a11y
 }
 
 Serializer.addClass(
diff --git a/src/react/reactquestion_checkbox.tsx b/src/react/reactquestion_checkbox.tsx
index 43be1745b8..cf11904308 100644
--- a/src/react/reactquestion_checkbox.tsx
+++ b/src/react/reactquestion_checkbox.tsx
@@ -20,9 +20,13 @@ export class SurveyQuestionCheckbox extends SurveyQuestionElementBase {
     var cssClasses = this.question.cssClasses;
     return (
       <fieldset
-        role="presentation"
         className={this.question.getSelectBaseRootCss()}
         ref={(fieldset) => (this.setControl(fieldset))}
+        aria-required={this.question.a11y_input_ariaRequired}
+        aria-label={this.question.a11y_input_ariaLabel}
+        aria-labelledby={this.question.a11y_input_ariaLabelledBy}
+        aria-invalid={this.question.a11y_input_ariaInvalid}
+        aria-describedby={this.question.a11y_input_ariaDescribedBy}
       >
         <legend role="presentation" className={"sv-hidden"}></legend>
         {this.getHeader()}
@@ -214,7 +218,6 @@ export class SurveyQuestionCheckboxItem extends ReactSurveyElement {
         <label className={labelClass} aria-label={this.question.getAriaItemLabel(this.item)}>
           <input
             className={this.cssClasses.itemControl}
-            role="option"
             type="checkbox"
             name={this.question.name}
             value={this.item.value != "selectall" ? this.item.value : undefined}
@@ -223,7 +226,6 @@ export class SurveyQuestionCheckboxItem extends ReactSurveyElement {
             disabled={!this.question.getItemEnabled(this.item)}
             checked={isChecked}
             onChange={onItemChanged}
-            aria-describedby={this.question.ariaDescribedBy}
           />
           {
             this.cssClasses.materialDecorator ?
diff --git a/src/react/reactquestion_radiogroup.tsx b/src/react/reactquestion_radiogroup.tsx
index 2470af78c9..62416f9d86 100644
--- a/src/react/reactquestion_radiogroup.tsx
+++ b/src/react/reactquestion_radiogroup.tsx
@@ -31,8 +31,12 @@ export class SurveyQuestionRadiogroup extends SurveyQuestionElementBase {
     return (
       <fieldset
         className={this.question.getSelectBaseRootCss()}
-        role="presentation"
         ref={(fieldset) => (this.setControl(fieldset))}
+        aria-required={this.question.a11y_input_ariaRequired}
+        aria-label={this.question.a11y_input_ariaLabel}
+        aria-labelledby={this.question.a11y_input_ariaLabelledBy}
+        aria-invalid={this.question.a11y_input_ariaInvalid}
+        aria-describedby={this.question.a11y_input_ariaDescribedBy}
       >
         {this.question.hasColumns
           ? this.getColumnedBody(cssClasses)

From 7d7f80db7ee889bebe8e5d0284fba2fd9e665d0e Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Fri, 8 Sep 2023 16:36:27 +0400
Subject: [PATCH 2/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (remove code
 duplication)

---
 src/question.ts            | 91 +++++++++++++++++++++++++++++---------
 src/question_checkbox.ts   | 50 +--------------------
 src/question_radiogroup.ts | 50 +--------------------
 src/question_textbase.ts   | 46 +------------------
 4 files changed, 75 insertions(+), 162 deletions(-)

diff --git a/src/question.ts b/src/question.ts
index 0550ff79f8..f1e68474dd 100644
--- a/src/question.ts
+++ b/src/question.ts
@@ -226,25 +226,6 @@ export class Question extends SurveyElement<Question>
   public get isReady(): boolean {
     return this.isReadyValue;
   }
-  public get ariaRequired() {
-    return this.isRequired ? "true" : "false";
-  }
-  public get ariaInvalid() {
-    return this.errors.length > 0 ? "true" : "false";
-  }
-  public get ariaLabelledBy(): string {
-    if (this.hasTitle) {
-      return this.ariaTitleId;
-    } else {
-      return null;
-    }
-  }
-  public get ariaExpanded(): string {
-    return null;
-  }
-  public get ariaDescribedBy(): string {
-    return this.errors.length > 0 ? this.id + "_errors" : null;
-  }
 
   public choicesLoaded(): void { }
   /**
@@ -1148,9 +1129,6 @@ export class Question extends SurveyElement<Question>
   public get commentId(): string {
     return this.id + "_comment";
   }
-  public get ariaRole(): string {
-    return "textbox";
-  }
   /**
    * Specifies whether to display the "Other" choice item. Incompatible with the `showCommentArea` property.
    *
@@ -2332,6 +2310,75 @@ export class Question extends SurveyElement<Question>
       this.dependedQuestions[i].resetDependedQuestion();
     }
   }
+
+  //a11y
+  public get isNewA11yStructure(): boolean {
+    return false;
+  }
+  public get ariaLabel(): string {
+    if (this.isNewA11yStructure) return null;
+
+    return this.locTitle.renderedHtml;
+  }
+  public get ariaRole(): string {
+    if (this.isNewA11yStructure) return null;
+
+    return "textbox";
+  }
+  public get ariaRequired() {
+    if (this.isNewA11yStructure) return null;
+
+    return this.isRequired ? "true" : "false";
+  }
+  public get ariaInvalid() {
+    if (this.isNewA11yStructure) return null;
+
+    return this.errors.length > 0 ? "true" : "false";
+  }
+  public get ariaLabelledBy(): string {
+    if (this.isNewA11yStructure) return null;
+
+    if (this.hasTitle) {
+      return this.ariaTitleId;
+    } else {
+      return null;
+    }
+  }
+  public get ariaExpanded(): string {
+    return null;
+  }
+  public get ariaDescribedBy(): string {
+    if (this.isNewA11yStructure) return null;
+
+    return this.errors.length > 0 ? this.id + "_errors" : null;
+  }
+  //EO a11y
+
+  //new a11y
+  public get a11y_input_ariaRequired(): "true" | "false" {
+    return this.isRequired ? "true" : "false";
+  }
+  public get a11y_input_ariaInvalid(): "true" | "false" {
+    return this.errors.length > 0 ? "true" : "false";
+  }
+  public get a11y_input_ariaLabel(): string {
+    if (this.hasTitle) {
+      return null;
+    } else {
+      return this.locTitle.renderedHtml;
+    }
+  }
+  public get a11y_input_ariaLabelledBy(): string {
+    if (this.hasTitle) {
+      return this.ariaTitleId;
+    } else {
+      return null;
+    }
+  }
+  public get a11y_input_ariaDescribedBy(): string {
+    return this.errors.length > 0 ? this.id + "_errors" : null;
+  }
+  //EO new a11y
 }
 function makeNameValid(str: string): string {
   if(!str) return str;
diff --git a/src/question_checkbox.ts b/src/question_checkbox.ts
index e2953f60ce..9e1bd9f30e 100644
--- a/src/question_checkbox.ts
+++ b/src/question_checkbox.ts
@@ -579,54 +579,8 @@ export class QuestionCheckboxModel extends QuestionCheckboxBase {
   }
 
   //a11y
-  public get titleAriaLabel(): string | null {
-    return null;
-  }
-
-  public get ariaRole(): string {
-    return null;
-  }
-  public get ariaRequired():any {
-    return null;
-  }
-  public get ariaInvalid():any {
-    return null;
-  }
-  public get ariaLabel(): string {
-    return null;
-  }
-  public get ariaLabelledBy(): string {
-    return null;
-  }
-  public get ariaDescribedBy(): string {
-    return null;
-  }
-
-  public get a11y_input_ariaRole(): string {
-    return "listbox";
-  }
-  public get a11y_input_ariaRequired(): "true" | "false" {
-    return this.isRequired ? "true" : "false";
-  }
-  public get a11y_input_ariaInvalid(): "true" | "false" {
-    return this.errors.length > 0 ? "true" : "false";
-  }
-  public get a11y_input_ariaLabel(): string {
-    if (this.hasTitle) {
-      return null;
-    } else {
-      return this.locTitle.renderedHtml;
-    }
-  }
-  public get a11y_input_ariaLabelledBy(): string {
-    if (this.hasTitle) {
-      return this.ariaTitleId;
-    } else {
-      return null;
-    }
-  }
-  public get a11y_input_ariaDescribedBy(): string {
-    return this.errors.length > 0 ? this.id + "_errors" : null;
+  public get isNewA11yStructure(): boolean {
+    return true;
   }
   // EO a11y
 }
diff --git a/src/question_radiogroup.ts b/src/question_radiogroup.ts
index a15c097c6e..a96ea0e3e6 100644
--- a/src/question_radiogroup.ts
+++ b/src/question_radiogroup.ts
@@ -79,54 +79,8 @@ export class QuestionRadiogroupModel extends QuestionCheckboxBase {
   }
 
   //a11y
-  public get titleAriaLabel(): string | null {
-    return null;
-  }
-
-  public get ariaRole(): string {
-    return null;
-  }
-  public get ariaRequired():any {
-    return null;
-  }
-  public get ariaInvalid():any {
-    return null;
-  }
-  public get ariaLabel(): string {
-    return null;
-  }
-  public get ariaLabelledBy(): string {
-    return null;
-  }
-  public get ariaDescribedBy(): string {
-    return null;
-  }
-
-  public get a11y_input_ariaRole(): string {
-    return "radiogroup";
-  }
-  public get a11y_input_ariaRequired(): "true" | "false" {
-    return this.isRequired ? "true" : "false";
-  }
-  public get a11y_input_ariaInvalid(): "true" | "false" {
-    return this.errors.length > 0 ? "true" : "false";
-  }
-  public get a11y_input_ariaLabel(): string {
-    if (this.hasTitle) {
-      return null;
-    } else {
-      return this.locTitle.renderedHtml;
-    }
-  }
-  public get a11y_input_ariaLabelledBy(): string {
-    if (this.hasTitle) {
-      return this.ariaTitleId;
-    } else {
-      return null;
-    }
-  }
-  public get a11y_input_ariaDescribedBy(): string {
-    return this.errors.length > 0 ? this.id + "_errors" : null;
+  public get isNewA11yStructure(): boolean {
+    return true;
   }
   // EO a11y
 }
diff --git a/src/question_textbase.ts b/src/question_textbase.ts
index e8958ac004..61b4451ceb 100644
--- a/src/question_textbase.ts
+++ b/src/question_textbase.ts
@@ -137,50 +137,8 @@ export class QuestionTextBase extends Question {
   }
 
   //a11y
-  public get ariaRole(): string {
-    return null;
-  }
-  public get ariaRequired():any {
-    return null;
-  }
-  public get ariaInvalid():any {
-    return null;
-  }
-  public get ariaLabel(): string {
-    return null;
-  }
-  public get ariaLabelledBy(): string {
-    return null;
-  }
-  public get ariaDescribedBy(): string {
-    return null;
-  }
-
-  public get a11y_input_ariaRole(): string {
-    return "textbox";
-  }
-  public get a11y_input_ariaRequired(): "true" | "false" {
-    return this.isRequired ? "true" : "false";
-  }
-  public get a11y_input_ariaInvalid(): "true" | "false" {
-    return this.errors.length > 0 ? "true" : "false";
-  }
-  public get a11y_input_ariaLabel(): string {
-    if (this.hasTitle && !this.parentQuestion) {
-      return null;
-    } else {
-      return this.locTitle.renderedHtml;
-    }
-  }
-  public get a11y_input_ariaLabelledBy(): string {
-    if (this.hasTitle && !this.parentQuestion) {
-      return this.ariaTitleId;
-    } else {
-      return null;
-    }
-  }
-  public get a11y_input_ariaDescribedBy(): string {
-    return this.errors.length > 0 ? this.id + "_errors" : null;
+  public get isNewA11yStructure(): boolean {
+    return true;
   }
   // EO a11y
 }

From fdeba8398ce4e1ca07977422487edb9a43b1dab3 Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Fri, 8 Sep 2023 18:52:42 +0400
Subject: [PATCH 3/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (other items)

---
 src/react/reactquestion_checkbox.tsx   | 2 +-
 src/react/reactquestion_radiogroup.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/reactquestion_checkbox.tsx b/src/react/reactquestion_checkbox.tsx
index cf11904308..8328456500 100644
--- a/src/react/reactquestion_checkbox.tsx
+++ b/src/react/reactquestion_checkbox.tsx
@@ -215,7 +215,7 @@ export class SurveyQuestionCheckboxItem extends ReactSurveyElement {
 
     return (
       <div className={itemClass} role="presentation">
-        <label className={labelClass} aria-label={this.question.getAriaItemLabel(this.item)}>
+        <label className={labelClass}>
           <input
             className={this.cssClasses.itemControl}
             type="checkbox"
diff --git a/src/react/reactquestion_radiogroup.tsx b/src/react/reactquestion_radiogroup.tsx
index 62416f9d86..33670534e7 100644
--- a/src/react/reactquestion_radiogroup.tsx
+++ b/src/react/reactquestion_radiogroup.tsx
@@ -197,7 +197,7 @@ export class SurveyQuestionRadioItem extends ReactSurveyElement {
         className={itemClass}
         role="presentation"
       >
-        <label onMouseDown={this.handleOnMouseDown} className={labelClass} aria-label={this.question.getAriaItemLabel(this.item)}>
+        <label onMouseDown={this.handleOnMouseDown} className={labelClass}>
           <input
             aria-describedby={this.question.ariaDescribedBy}
             className={this.cssClasses.itemControl}

From 44ee73aca21bff15534fce8e255224a7a7b8eddc Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Fri, 8 Sep 2023 18:53:10 +0400
Subject: [PATCH 4/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (fix markups)

---
 src/question_ranking.ts                       |  6 +++++
 src/question_tagbox.ts                        |  6 +++++
 src/react/reactquestion_comment.tsx           |  4 ++--
 .../checkbox-columns-head-foot.snap.html      | 22 +++++++++----------
 .../checkbox-columns-mobile.snap.html         | 14 ++++++------
 .../checkbox-columns-no-head-foot.snap.html   | 22 +++++++++----------
 .../snapshots/checkbox-columns.snap.html      | 10 ++++-----
 .../snapshots/checkbox-modern.snap.html       | 10 ++++-----
 .../snapshots/checkbox-other-V2.snap.html     | 12 +++++-----
 .../markup/snapshots/checkbox-other.snap.html | 20 ++++++++---------
 .../checkbox-readonly-selected.snap.html      | 14 ++++++------
 .../snapshots/checkbox-readonly.snap.html     | 14 ++++++------
 .../checkbox-row-head-foot.snap.html          | 22 +++++++++----------
 .../checkbox-row-no-head-foot.snap.html       | 22 +++++++++----------
 tests/markup/snapshots/checkbox-v2.snap.html  | 10 ++++-----
 tests/markup/snapshots/checkbox.snap.html     | 14 ++++++------
 ...omment-into-question-allowResize.snap.html | 10 ++++-----
 ...-show-in-multiple-columns-mobile.snap.html | 14 ++++++------
 ...dynamic-show-in-multiple-columns.snap.html | 10 ++++-----
 .../snapshots/radiogroup-clear.snap.html      |  6 ++---
 .../radiogroup-columns-head-foot.snap.html    | 10 ++++-----
 .../radiogroup-columns-mobile.snap.html       |  8 +++----
 .../radiogroup-columns-no-head-foot.snap.html | 10 ++++-----
 .../snapshots/radiogroup-columns.snap.html    |  6 ++---
 .../snapshots/radiogroup-modern.snap.html     |  6 ++---
 .../snapshots/radiogroup-other.snap.html      | 10 ++++-----
 .../radiogroup-readonly-selected.snap.html    |  8 +++----
 .../snapshots/radiogroup-readonly.snap.html   |  8 +++----
 .../radiogroup-row-head-foot.snap.html        | 10 ++++-----
 .../radiogroup-row-no-head-foot.snap.html     | 10 ++++-----
 .../markup/snapshots/radiogroup-v2.snap.html  |  6 ++---
 tests/markup/snapshots/radiogroup.snap.html   |  8 +++----
 32 files changed, 187 insertions(+), 175 deletions(-)

diff --git a/src/question_ranking.ts b/src/question_ranking.ts
index 7f56185c2f..13b4ab7dc1 100644
--- a/src/question_ranking.ts
+++ b/src/question_ranking.ts
@@ -544,6 +544,12 @@ export class QuestionRankingModel extends QuestionCheckboxModel {
   public set useFullItemSizeForShortcut(val: boolean) {
     this.setPropertyValue("useFullItemSizeForShortcut", val);
   }
+
+  //a11y
+  public get isNewA11yStructure(): boolean {
+    return false;
+  }
+  // EO a11y
 }
 
 Serializer.addClass(
diff --git a/src/question_tagbox.ts b/src/question_tagbox.ts
index f2632fa495..92f7dbd739 100644
--- a/src/question_tagbox.ts
+++ b/src/question_tagbox.ts
@@ -213,6 +213,12 @@ export class QuestionTagboxModel extends QuestionCheckboxModel {
     super.clearValue();
     this.dropdownListModel.clear();
   }
+
+  //a11y
+  public get isNewA11yStructure(): boolean {
+    return false;
+  }
+  // EO a11y
 }
 
 Serializer.addClass(
diff --git a/src/react/reactquestion_comment.tsx b/src/react/reactquestion_comment.tsx
index 30fb7bf93e..cf94ff8a10 100644
--- a/src/react/reactquestion_comment.tsx
+++ b/src/react/reactquestion_comment.tsx
@@ -100,8 +100,8 @@ export class SurveyQuestionCommentItem extends ReactSurveyElement {
         onChange={handleOnChange}
         onBlur={(e) => { this.onCommentChange(e); handleOnChange(e); }}
         onInput={(e) => this.onCommentInput(e)}
-        aria-required={question.isRequired}
-        aria-label={question.locTitle.renderedHtml}
+        aria-required={question.isRequired || question.a11y_input_ariaRequired}
+        aria-label={question.ariaLabel || question.a11y_input_ariaLabel}
         style={{ resize: question.resizeStyle }}
       />
     );
diff --git a/tests/markup/snapshots/checkbox-columns-head-foot.snap.html b/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
index 3f0424a46b..d701928300 100644
--- a/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
@@ -1,9 +1,9 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_selectall" role="presentation">
-		<label aria-label="Select All" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Select All</span>
 			</span>
@@ -12,8 +12,8 @@
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
-				<label aria-label="item1" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item1">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item1">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item1</span>
 					</span>
@@ -22,8 +22,8 @@
 		</div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
-				<label aria-label="item2" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" role="option" type="checkbox" value="item2">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" type="checkbox" value="item2">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item2</span>
 					</span>
@@ -32,16 +32,16 @@
 		</div>
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_none" role="presentation">
-		<label aria-label="None" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" role="option" type="checkbox" value="none">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" type="checkbox" value="none">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">None</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" role="option" type="checkbox" value="other">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-columns-mobile.snap.html b/tests/markup/snapshots/checkbox-columns-mobile.snap.html
index 337598b5cd..ad5fcf1388 100644
--- a/tests/markup/snapshots/checkbox-columns-mobile.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-mobile.snap.html
@@ -1,25 +1,25 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-2" role="presentation">
-		<label aria-label="item1" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-2" role="presentation">
-		<label aria-label="item2" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-2" role="presentation">
-		<label aria-label="item3" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" role="option" type="checkbox" value="item3">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html b/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
index e399d5aec1..18100fde11 100644
--- a/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
@@ -1,27 +1,27 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox sv_q_checkbox_selectall" role="presentation">
-				<label aria-label="Select All" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">Select All</span>
 					</span>
 				</label>
 			</div>
 			<div class="sv_q_checkbox" role="presentation">
-				<label aria-label="item2" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" role="option" type="checkbox" value="item2">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" type="checkbox" value="item2">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item2</span>
 					</span>
 				</label>
 			</div>
 			<div class="sv_q_checkbox" role="presentation">
-				<label aria-label="Other (describe)" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" role="option" type="checkbox" value="other">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" type="checkbox" value="other">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">Other (describe)</span>
 					</span>
@@ -30,16 +30,16 @@
 		</div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
-				<label aria-label="item1" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item1">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item1">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item1</span>
 					</span>
 				</label>
 			</div>
 			<div class="sv_q_checkbox sv_q_checkbox_none" role="presentation">
-				<label aria-label="None" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" role="option" type="checkbox" value="none">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" type="checkbox" value="none">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">None</span>
 					</span>
diff --git a/tests/markup/snapshots/checkbox-columns.snap.html b/tests/markup/snapshots/checkbox-columns.snap.html
index c1a9bb9bb6..3e92cfc0a4 100644
--- a/tests/markup/snapshots/checkbox-columns.snap.html
+++ b/tests/markup/snapshots/checkbox-columns.snap.html
@@ -1,11 +1,11 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
-				<label aria-label="item1" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="item1">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item1</span>
 					</span>
@@ -14,8 +14,8 @@
 		</div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
-				<label aria-label="item2" class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+				<label class="sv_q_checkbox_label">
+					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item2">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item2</span>
 					</span>
diff --git a/tests/markup/snapshots/checkbox-modern.snap.html b/tests/markup/snapshots/checkbox-modern.snap.html
index a158696885..b98adeebd1 100644
--- a/tests/markup/snapshots/checkbox-modern.snap.html
+++ b/tests/markup/snapshots/checkbox-modern.snap.html
@@ -1,9 +1,9 @@
-<fieldset class="sv-selectbase" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv-selectbase">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv-checkbox sv-checkbox--allowhover sv-item sv-q-col-1 sv-selectbase__item" role="presentation">
-		<label aria-label="item1" class="sv-selectbase__label">
-			<input class="sv-item__control sv-visuallyhidden" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sv-selectbase__label">
+			<input class="sv-item__control sv-visuallyhidden" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sv-checkbox__decorator sv-item__decorator sv-selectbase__decorator">
 				<svg class="sv-checkbox__svg sv-item__svg">
 					<use xlink:href="#icon-moderncheck" class="">
@@ -16,8 +16,8 @@
 		</label>
 	</div>
 	<div class="sv-checkbox sv-checkbox--allowhover sv-item sv-q-col-1 sv-selectbase__item" role="presentation">
-		<label aria-label="item2" class="sv-selectbase__label">
-			<input class="sv-item__control sv-visuallyhidden" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+		<label class="sv-selectbase__label">
+			<input class="sv-item__control sv-visuallyhidden" id="testid0i_1" name="name" type="checkbox" value="item2">
 			<span class="sv-checkbox__decorator sv-item__decorator sv-selectbase__decorator">
 				<svg class="sv-checkbox__svg sv-item__svg">
 					<use xlink:href="#icon-moderncheck" class="">
diff --git a/tests/markup/snapshots/checkbox-other-V2.snap.html b/tests/markup/snapshots/checkbox-other-V2.snap.html
index d1d8ee7093..7624d54bfc 100644
--- a/tests/markup/snapshots/checkbox-other-V2.snap.html
+++ b/tests/markup/snapshots/checkbox-other-V2.snap.html
@@ -1,9 +1,9 @@
-<fieldset class="sd-selectbase" role="presentation">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sd-selectbase__label">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -16,8 +16,8 @@
 		</label>
 	</div>
 	<div class="sd-checkbox sd-checkbox--checked sd-item sd-item--checked sd-selectbase__item sv-q-col-1" role="presentation">
-		<label aria-label="Other (describe)" class="sd-selectbase__label">
-			<input checked="" class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="name" role="option" type="checkbox" value="other">
+		<label class="sd-selectbase__label">
+			<input checked="" class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="name" type="checkbox" value="other">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -30,7 +30,7 @@
 		</label>
 	</div>
 	<div class="form-group sd-question__comment-area">
-		<textarea aria-label="name" aria-required="false" class="sd-comment sd-input sd-selectbase__other" id="testid0_other" placeholder="" style="resize: both;">
+		<textarea aria-label="name" aria-required="false" class="sd-comment sd-input sd-selectbase__other" id="testid0_other" placeholder="" style="resize:both;">
 		</textarea>
 	</div>
 </fieldset>
\ No newline at end of file
diff --git a/tests/markup/snapshots/checkbox-other.snap.html b/tests/markup/snapshots/checkbox-other.snap.html
index 3afca6a5c8..31dbce3b59 100644
--- a/tests/markup/snapshots/checkbox-other.snap.html
+++ b/tests/markup/snapshots/checkbox-other.snap.html
@@ -1,40 +1,40 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" role="option" type="checkbox" value="item3">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
 		</label>
 	</div>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_checkbox_label">
-			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_3" name="name" role="option" type="checkbox" value="other">
+		<label class="sv_q_checkbox_label">
+			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_3" name="name" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
 		</label>
 	</div>
 	<div class="form-group">
-		<textarea aria-label="Question title" aria-required="false" class="sv_q_checkbox_other sv_q_other" id="testid0_other" placeholder="" style="resize: both;">
+		<textarea aria-label="Question title" aria-required="false" class="sv_q_checkbox_other sv_q_other" id="testid0_other" placeholder="" style="resize:both;">
 		</textarea>
 	</div>
 </fieldset>
\ No newline at end of file
diff --git a/tests/markup/snapshots/checkbox-readonly-selected.snap.html b/tests/markup/snapshots/checkbox-readonly-selected.snap.html
index 175116c4c1..6b935b16a2 100644
--- a/tests/markup/snapshots/checkbox-readonly-selected.snap.html
+++ b/tests/markup/snapshots/checkbox-readonly-selected.snap.html
@@ -1,25 +1,25 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_checkbox_label">
-			<input checked="" class="sv_q_checkbox_control_item" disabled="" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sv_q_checkbox_label">
+			<input checked="" class="sv_q_checkbox_control_item" disabled="" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_1" name="name" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_2" name="name" role="option" type="checkbox" value="item3">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_2" name="name" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-readonly.snap.html b/tests/markup/snapshots/checkbox-readonly.snap.html
index 5ba3efbd93..983499b667 100644
--- a/tests/markup/snapshots/checkbox-readonly.snap.html
+++ b/tests/markup/snapshots/checkbox-readonly.snap.html
@@ -1,25 +1,25 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_1" name="name" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_2" name="name" role="option" type="checkbox" value="item3">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_2" name="name" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-row-head-foot.snap.html b/tests/markup/snapshots/checkbox-row-head-foot.snap.html
index cbb3e65b1a..c1b81c3e57 100644
--- a/tests/markup/snapshots/checkbox-row-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-row-head-foot.snap.html
@@ -1,9 +1,9 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_selectall" role="presentation">
-		<label aria-label="Select All" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Select All</span>
 			</span>
@@ -11,16 +11,16 @@
 	</div>
 	<div>
 		<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
-			<label aria-label="item1" class="sv_q_checkbox_label">
-				<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item1">
+			<label class="sv_q_checkbox_label">
+				<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item1">
 				<span class="sv_q_checkbox_control_label">
 					<span class="sv-string-viewer">item1</span>
 				</span>
 			</label>
 		</div>
 		<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
-			<label aria-label="item2" class="sv_q_checkbox_label">
-				<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" role="option" type="checkbox" value="item2">
+			<label class="sv_q_checkbox_label">
+				<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" type="checkbox" value="item2">
 				<span class="sv_q_checkbox_control_label">
 					<span class="sv-string-viewer">item2</span>
 				</span>
@@ -28,16 +28,16 @@
 		</div>
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_none" role="presentation">
-		<label aria-label="None" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" role="option" type="checkbox" value="none">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" type="checkbox" value="none">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">None</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" role="option" type="checkbox" value="other">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html b/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
index 48e1cc08f2..33f8d18a39 100644
--- a/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
@@ -1,41 +1,41 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_selectall" role="presentation">
-		<label aria-label="Select All" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Select All</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
-		<label aria-label="item1" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item1">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
-		<label aria-label="item2" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" role="option" type="checkbox" value="item2">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_none" role="presentation">
-		<label aria-label="None" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" role="option" type="checkbox" value="none">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="name" type="checkbox" value="none">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">None</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" role="option" type="checkbox" value="other">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="name" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-v2.snap.html b/tests/markup/snapshots/checkbox-v2.snap.html
index 4dd495f0d4..24f28819bb 100644
--- a/tests/markup/snapshots/checkbox-v2.snap.html
+++ b/tests/markup/snapshots/checkbox-v2.snap.html
@@ -1,9 +1,9 @@
-<fieldset class="sd-selectbase" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sd-selectbase">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sd-selectbase__label">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -16,8 +16,8 @@
 		</label>
 	</div>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+		<label class="sd-selectbase__label">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="name" type="checkbox" value="item2">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
diff --git a/tests/markup/snapshots/checkbox.snap.html b/tests/markup/snapshots/checkbox.snap.html
index f09d7962b7..4e769c591a 100644
--- a/tests/markup/snapshots/checkbox.snap.html
+++ b/tests/markup/snapshots/checkbox.snap.html
@@ -1,25 +1,25 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" role="option" type="checkbox" value="item2">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="name" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
 		</label>
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" role="option" type="checkbox" value="item3">
+		<label class="sv_q_checkbox_label">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="name" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/comment-into-question-allowResize.snap.html b/tests/markup/snapshots/comment-into-question-allowResize.snap.html
index d3303977ac..5cfac6199b 100644
--- a/tests/markup/snapshots/comment-into-question-allowResize.snap.html
+++ b/tests/markup/snapshots/comment-into-question-allowResize.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sv_qcbc">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="Item 1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="Item 1">
 			<span>
 				<span class="sv-string-viewer">Item 1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="Item 2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="Item 2">
 			<span>
 				<span class="sv-string-viewer">Item 2</span>
@@ -16,7 +16,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="Item 3" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="Item 3">
 			<span>
 				<span class="sv-string-viewer">Item 3</span>
@@ -24,7 +24,7 @@
 		</label>
 	</div>
 	<div class="checked sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input checked="" class="sv_q_radiogroup_control_item" id="testid0i_3" name="name_testid0" type="radio" value="other">
 			<span>
 				<span class="sv-string-viewer">Other (describe)</span>
diff --git a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
index 5696e386d1..dcbaf00639 100644
--- a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
+++ b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
@@ -25,9 +25,9 @@
 				</td>
 				<td class="sd-table__cell" colspan="1" data-responsive-title="col1" title="col1">
 					<div class="sd-table__question-wrapper">
-						<fieldset class="sd-selectbase sd-selectbase--row" role="presentation">
+						<fieldset aria-invalid="false" aria-labelledby="testid0row1cell1_ariaTitle" aria-required="true" class="sd-selectbase sd-selectbase--row">
 							<div class="sd-item sd-item--allowhover sd-radio sd-radio--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
-								<label aria-label="Item 1" class="sd-selectbase__label">
+								<label class="sd-selectbase__label">
 									<input class="sd-item__control sd-radio__control sd-visuallyhidden" id="testid0row1cell1i_0" name="col1_testid0row1cell1" type="radio" value="Item 1">
 									<span class="sd-item__decorator sd-radio__decorator">
 									</span>
@@ -43,12 +43,12 @@
 				</td>
 				<td class="sd-table__cell" colspan="1" data-responsive-title="col2" title="col2">
 					<div class="sd-table__question-wrapper">
-						<fieldset class="sd-selectbase sd-selectbase--row" role="presentation">
+						<fieldset aria-invalid="false" aria-labelledby="testid0row1cell3_ariaTitle" aria-required="true" class="sd-selectbase sd-selectbase--row">
 							<legend class="sv-hidden" role="presentation">
 							</legend>
 							<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
-								<label aria-label="Item 1" class="sd-selectbase__label">
-									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2" role="option" type="checkbox" value="Item 1">
+								<label class="sd-selectbase__label">
+									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2" type="checkbox" value="Item 1">
 									<span class="sd-checkbox__decorator sd-item__decorator">
 										<svg class="sd-checkbox__svg sd-item__svg">
 											<use xlink:href="#icon-v2check" class="">
@@ -61,8 +61,8 @@
 								</label>
 							</div>
 							<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
-								<label aria-label="Item 2" class="sd-selectbase__label">
-									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2" role="option" type="checkbox" value="Item 2">
+								<label class="sd-selectbase__label">
+									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2" type="checkbox" value="Item 2">
 									<span class="sd-checkbox__decorator sd-item__decorator">
 										<svg class="sd-checkbox__svg sd-item__svg">
 											<use xlink:href="#icon-v2check" class="">
diff --git a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html
index ef2f9437c4..fcb0a16899 100644
--- a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html
+++ b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html
@@ -23,7 +23,7 @@
 				<td class="sd-table__cell--item" colspan="1" data-responsive-title="Item 1" title="Item 1">
 					<div class="sd-table__question-wrapper">
 						<div class="sd-item sd-item--allowhover sd-radio sd-radio--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
-							<label aria-label="Item 1" class="sd-selectbase__label">
+							<label class="sd-selectbase__label">
 								<input class="sd-item__control sd-radio__control sd-visuallyhidden" id="testid0row1cell1i_0" name="col1_testid0row1cell1" type="radio" value="Item 1">
 								<span class="sd-item__decorator sd-radio__decorator">
 								</span>
@@ -34,8 +34,8 @@
 				<td class="sd-table__cell--item" colspan="1" data-responsive-title="Item 1" title="Item 1">
 					<div class="sd-table__question-wrapper">
 						<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
-							<label aria-label="Item 1" class="sd-selectbase__label">
-								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2" role="option" type="checkbox" value="Item 1">
+							<label class="sd-selectbase__label">
+								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2" type="checkbox" value="Item 1">
 								<span class="sd-checkbox__decorator sd-item__decorator">
 									<svg class="sd-checkbox__svg sd-item__svg">
 										<use xlink:href="#icon-v2check" class="">
@@ -49,8 +49,8 @@
 				<td class="sd-table__cell--item" colspan="1" data-responsive-title="Item 2" title="Item 2">
 					<div class="sd-table__question-wrapper">
 						<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
-							<label aria-label="Item 2" class="sd-selectbase__label">
-								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2" role="option" type="checkbox" value="Item 2">
+							<label class="sd-selectbase__label">
+								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2" type="checkbox" value="Item 2">
 								<span class="sd-checkbox__decorator sd-item__decorator">
 									<svg class="sd-checkbox__svg sd-item__svg">
 										<use xlink:href="#icon-v2check" class="">
diff --git a/tests/markup/snapshots/radiogroup-clear.snap.html b/tests/markup/snapshots/radiogroup-clear.snap.html
index 209c4fc22a..de8b2886f0 100644
--- a/tests/markup/snapshots/radiogroup-clear.snap.html
+++ b/tests/markup/snapshots/radiogroup-clear.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span>
 				<span class="sv-string-viewer">item1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span>
 				<span class="sv-string-viewer">item2</span>
diff --git a/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html b/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html
index aaedaeabce..c8327c8665 100644
--- a/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html
@@ -1,8 +1,8 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="item1" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 					<span>
 						<span class="sv-string-viewer">item1</span>
@@ -12,7 +12,7 @@
 		</div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="item2" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 					<span>
 						<span class="sv-string-viewer">item2</span>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	<div class="sv_q_radiogroup" role="presentation">
-		<label aria-label="None" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="none">
 			<span>
 				<span class="sv-string-viewer">None</span>
@@ -30,7 +30,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_3" name="name_testid0" type="radio" value="other">
 			<span>
 				<span class="sv-string-viewer">Other (describe)</span>
diff --git a/tests/markup/snapshots/radiogroup-columns-mobile.snap.html b/tests/markup/snapshots/radiogroup-columns-mobile.snap.html
index 47cec40978..7e3f3565d1 100644
--- a/tests/markup/snapshots/radiogroup-columns-mobile.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns-mobile.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div class="sv_q_radiogroup sv-q-col-2" role="presentation">
-		<label aria-label="item1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span>
 				<span class="sv-string-viewer">item1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-2" role="presentation">
-		<label aria-label="item2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span>
 				<span class="sv-string-viewer">item2</span>
@@ -16,7 +16,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-2" role="presentation">
-		<label aria-label="item3" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="item3">
 			<span>
 				<span class="sv-string-viewer">item3</span>
diff --git a/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html b/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html
index 68526628a3..a9412e17c0 100644
--- a/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html
@@ -1,8 +1,8 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="item1" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 					<span>
 						<span class="sv-string-viewer">item1</span>
@@ -10,7 +10,7 @@
 				</label>
 			</div>
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="None" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="none">
 					<span>
 						<span class="sv-string-viewer">None</span>
@@ -20,7 +20,7 @@
 		</div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="item2" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 					<span>
 						<span class="sv-string-viewer">item2</span>
@@ -28,7 +28,7 @@
 				</label>
 			</div>
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="Other (describe)" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_3" name="name_testid0" type="radio" value="other">
 					<span>
 						<span class="sv-string-viewer">Other (describe)</span>
diff --git a/tests/markup/snapshots/radiogroup-columns.snap.html b/tests/markup/snapshots/radiogroup-columns.snap.html
index bd7b54764d..0469d81821 100644
--- a/tests/markup/snapshots/radiogroup-columns.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns.snap.html
@@ -1,8 +1,8 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="item1" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 					<span>
 						<span class="sv-string-viewer">item1</span>
@@ -12,7 +12,7 @@
 		</div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
-				<label aria-label="item2" class="sv_q_radiogroup_label">
+				<label class="sv_q_radiogroup_label">
 					<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 					<span>
 						<span class="sv-string-viewer">item2</span>
diff --git a/tests/markup/snapshots/radiogroup-modern.snap.html b/tests/markup/snapshots/radiogroup-modern.snap.html
index 7444d96a44..003d0d81bd 100644
--- a/tests/markup/snapshots/radiogroup-modern.snap.html
+++ b/tests/markup/snapshots/radiogroup-modern.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv-selectbase" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv-selectbase">
 	<div class="sv-item sv-q-col-1 sv-radio sv-radio--allowhover sv-selectbase__item" role="presentation">
-		<label aria-label="item1" class="sv-selectbase__label">
+		<label class="sv-selectbase__label">
 			<input class="sv-item__control sv-visuallyhidden" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span class="sv-item__decorator sv-radio__decorator sv-selectbase__decorator">
 				<svg class="sv-item__svg sv-radio__svg">
@@ -14,7 +14,7 @@
 		</label>
 	</div>
 	<div class="sv-item sv-q-col-1 sv-radio sv-radio--allowhover sv-selectbase__item" role="presentation">
-		<label aria-label="item2" class="sv-selectbase__label">
+		<label class="sv-selectbase__label">
 			<input class="sv-item__control sv-visuallyhidden" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span class="sv-item__decorator sv-radio__decorator sv-selectbase__decorator">
 				<svg class="sv-item__svg sv-radio__svg">
diff --git a/tests/markup/snapshots/radiogroup-other.snap.html b/tests/markup/snapshots/radiogroup-other.snap.html
index a84d2c956a..aee026d662 100644
--- a/tests/markup/snapshots/radiogroup-other.snap.html
+++ b/tests/markup/snapshots/radiogroup-other.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span>
 				<span class="sv-string-viewer">item1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span>
 				<span class="sv-string-viewer">item2</span>
@@ -16,7 +16,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="item3">
 			<span>
 				<span class="sv-string-viewer">item3</span>
@@ -24,7 +24,7 @@
 		</label>
 	</div>
 	<div class="checked sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input checked="" class="sv_q_radiogroup_control_item" id="testid0i_3" name="name_testid0" type="radio" value="other">
 			<span>
 				<span class="sv-string-viewer">Other (describe)</span>
diff --git a/tests/markup/snapshots/radiogroup-readonly-selected.snap.html b/tests/markup/snapshots/radiogroup-readonly-selected.snap.html
index 17142df6e3..8e8ce6790b 100644
--- a/tests/markup/snapshots/radiogroup-readonly-selected.snap.html
+++ b/tests/markup/snapshots/radiogroup-readonly-selected.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div class="checked sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input checked="" class="sv_q_radiogroup_control_item" disabled="" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span>
 				<span class="sv-string-viewer">item1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" disabled="" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span>
 				<span class="sv-string-viewer">item2</span>
@@ -16,7 +16,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" disabled="" id="testid0i_2" name="name_testid0" type="radio" value="item3">
 			<span>
 				<span class="sv-string-viewer">item3</span>
diff --git a/tests/markup/snapshots/radiogroup-readonly.snap.html b/tests/markup/snapshots/radiogroup-readonly.snap.html
index 82ac8fecb0..61ed5e53ee 100644
--- a/tests/markup/snapshots/radiogroup-readonly.snap.html
+++ b/tests/markup/snapshots/radiogroup-readonly.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" disabled="" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span>
 				<span class="sv-string-viewer">item1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" disabled="" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span>
 				<span class="sv-string-viewer">item2</span>
@@ -16,7 +16,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" disabled="" id="testid0i_2" name="name_testid0" type="radio" value="item3">
 			<span>
 				<span class="sv-string-viewer">item3</span>
diff --git a/tests/markup/snapshots/radiogroup-row-head-foot.snap.html b/tests/markup/snapshots/radiogroup-row-head-foot.snap.html
index a8e08892db..60db89c673 100644
--- a/tests/markup/snapshots/radiogroup-row-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-row-head-foot.snap.html
@@ -1,7 +1,7 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div>
 		<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-			<label aria-label="item1" class="sv_q_radiogroup_label">
+			<label class="sv_q_radiogroup_label">
 				<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 				<span>
 					<span class="sv-string-viewer">item1</span>
@@ -9,7 +9,7 @@
 			</label>
 		</div>
 		<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-			<label aria-label="item2" class="sv_q_radiogroup_label">
+			<label class="sv_q_radiogroup_label">
 				<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 				<span>
 					<span class="sv-string-viewer">item2</span>
@@ -18,7 +18,7 @@
 		</div>
 	</div>
 	<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-		<label aria-label="None" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="none">
 			<span>
 				<span class="sv-string-viewer">None</span>
@@ -26,7 +26,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_3" name="name_testid0" type="radio" value="other">
 			<span>
 				<span class="sv-string-viewer">Other (describe)</span>
diff --git a/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html b/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html
index 80e412bcd0..87e92e84ff 100644
--- a/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-		<label aria-label="item1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span>
 				<span class="sv-string-viewer">item1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-		<label aria-label="item2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span>
 				<span class="sv-string-viewer">item2</span>
@@ -16,7 +16,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-		<label aria-label="None" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="none">
 			<span>
 				<span class="sv-string-viewer">None</span>
@@ -24,7 +24,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_3" name="name_testid0" type="radio" value="other">
 			<span>
 				<span class="sv-string-viewer">Other (describe)</span>
diff --git a/tests/markup/snapshots/radiogroup-v2.snap.html b/tests/markup/snapshots/radiogroup-v2.snap.html
index f9ce4b2505..c9c00cd7ab 100644
--- a/tests/markup/snapshots/radiogroup-v2.snap.html
+++ b/tests/markup/snapshots/radiogroup-v2.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sd-selectbase" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sd-selectbase">
 	<div class="sd-item sd-item--allowhover sd-radio sd-radio--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sd-selectbase__label">
+		<label class="sd-selectbase__label">
 			<input class="sd-item__control sd-radio__control sd-visuallyhidden" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span class="sd-item__decorator sd-radio__decorator">
 			</span>
@@ -10,7 +10,7 @@
 		</label>
 	</div>
 	<div class="sd-item sd-item--allowhover sd-radio sd-radio--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sd-selectbase__label">
+		<label class="sd-selectbase__label">
 			<input class="sd-item__control sd-radio__control sd-visuallyhidden" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span class="sd-item__decorator sd-radio__decorator">
 			</span>
diff --git a/tests/markup/snapshots/radiogroup.snap.html b/tests/markup/snapshots/radiogroup.snap.html
index 1289564a02..11c696c13e 100644
--- a/tests/markup/snapshots/radiogroup.snap.html
+++ b/tests/markup/snapshots/radiogroup.snap.html
@@ -1,6 +1,6 @@
-<fieldset class="sv_qcbc" role="presentation">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
 			<span>
 				<span class="sv-string-viewer">item1</span>
@@ -8,7 +8,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item2" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_1" name="name_testid0" type="radio" value="item2">
 			<span>
 				<span class="sv-string-viewer">item2</span>
@@ -16,7 +16,7 @@
 		</label>
 	</div>
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
-		<label aria-label="item3" class="sv_q_radiogroup_label">
+		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_2" name="name_testid0" type="radio" value="item3">
 			<span>
 				<span class="sv-string-viewer">item3</span>

From c2adcdeaeb77922ea60162779054929e79b01c06 Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Mon, 11 Sep 2023 12:43:15 +0400
Subject: [PATCH 5/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (fix markups-2)

---
 src/question.ts                                           | 4 ++--
 tests/markup/snapshots/checkbox-comment-V2.snap.html      | 8 ++++----
 tests/markup/snapshots/checkbox-other-maxlength.snap.html | 6 +++---
 ...atrixdynamic-show-in-multiple-columns-mobile.snap.html | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/question.ts b/src/question.ts
index f1e68474dd..423b79ccf6 100644
--- a/src/question.ts
+++ b/src/question.ts
@@ -2362,14 +2362,14 @@ export class Question extends SurveyElement<Question>
     return this.errors.length > 0 ? "true" : "false";
   }
   public get a11y_input_ariaLabel(): string {
-    if (this.hasTitle) {
+    if (this.hasTitle && !this.parentQuestion) {
       return null;
     } else {
       return this.locTitle.renderedHtml;
     }
   }
   public get a11y_input_ariaLabelledBy(): string {
-    if (this.hasTitle) {
+    if (this.hasTitle && !this.parentQuestion) {
       return this.ariaTitleId;
     } else {
       return null;
diff --git a/tests/markup/snapshots/checkbox-comment-V2.snap.html b/tests/markup/snapshots/checkbox-comment-V2.snap.html
index 7d3e2b5d33..4aa4dc5c31 100644
--- a/tests/markup/snapshots/checkbox-comment-V2.snap.html
+++ b/tests/markup/snapshots/checkbox-comment-V2.snap.html
@@ -1,9 +1,9 @@
-<fieldset class="sd-selectbase" role="presentation">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
-		<label aria-label="item1" class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="name" role="option" type="checkbox" value="item1">
+		<label class="sd-selectbase__label">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="name" type="checkbox" value="item1">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -20,6 +20,6 @@
 	<div>
 		<span class="sv-string-viewer">Other (describe)</span>
 	</div>
-	<textarea aria-label="name" aria-required="false" class="sd-comment sd-input sd-selectbase__other" id="testid0_comment" placeholder="" style="resize: both;">
+	<textarea aria-label="name" aria-required="false" class="sd-comment sd-input sd-selectbase__other" id="testid0_comment" placeholder="" style="resize:both;">
 	</textarea>
 </div>
\ No newline at end of file
diff --git a/tests/markup/snapshots/checkbox-other-maxlength.snap.html b/tests/markup/snapshots/checkbox-other-maxlength.snap.html
index 4e12239301..13a501fa7d 100644
--- a/tests/markup/snapshots/checkbox-other-maxlength.snap.html
+++ b/tests/markup/snapshots/checkbox-other-maxlength.snap.html
@@ -1,9 +1,9 @@
-<fieldset class="sv_qcbc sv_qcbx" role="presentation">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sv_qcbc sv_qcbx">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
-		<label aria-label="Other (describe)" class="sv_q_checkbox_label">
-			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_0" name="name" role="option" type="checkbox" value="other">
+		<label class="sv_q_checkbox_label">
+			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_0" name="name" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
diff --git a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
index dcbaf00639..edb6d69575 100644
--- a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
+++ b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
@@ -25,7 +25,7 @@
 				</td>
 				<td class="sd-table__cell" colspan="1" data-responsive-title="col1" title="col1">
 					<div class="sd-table__question-wrapper">
-						<fieldset aria-invalid="false" aria-labelledby="testid0row1cell1_ariaTitle" aria-required="true" class="sd-selectbase sd-selectbase--row">
+						<fieldset aria-invalid="false" aria-label="col1" aria-required="true" class="sd-selectbase sd-selectbase--row">
 							<div class="sd-item sd-item--allowhover sd-radio sd-radio--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
 								<label class="sd-selectbase__label">
 									<input class="sd-item__control sd-radio__control sd-visuallyhidden" id="testid0row1cell1i_0" name="col1_testid0row1cell1" type="radio" value="Item 1">
@@ -43,7 +43,7 @@
 				</td>
 				<td class="sd-table__cell" colspan="1" data-responsive-title="col2" title="col2">
 					<div class="sd-table__question-wrapper">
-						<fieldset aria-invalid="false" aria-labelledby="testid0row1cell3_ariaTitle" aria-required="true" class="sd-selectbase sd-selectbase--row">
+						<fieldset aria-invalid="false" aria-label="col2" aria-required="true" class="sd-selectbase sd-selectbase--row">
 							<legend class="sv-hidden" role="presentation">
 							</legend>
 							<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">

From 26b721eda38d43653443d05c79fd8d1f2e379930 Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Mon, 11 Sep 2023 13:59:50 +0400
Subject: [PATCH 6/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (fix markups-3)

---
 .../survey-angular-ui/src/comment-other.component.html |  2 +-
 packages/survey-angular-ui/src/comment.component.html  |  2 +-
 .../src/questions/checkbox-item.component.html         |  4 ++--
 .../src/questions/selectbase-item.html                 |  4 ++--
 .../src/questions/selectbase.component.html            |  8 +++++++-
 packages/survey-vue3-ui/src/QuestionComment.vue        |  4 ++--
 packages/survey-vue3-ui/src/QuestionOther.vue          |  4 ++--
 src/knockout/templates/comment.html                    |  4 ++--
 src/knockout/templates/question-checkbox.html          |  8 ++++----
 src/knockout/templates/question-radiogroup.html        |  4 ++--
 src/vue/checkbox.vue                                   |  8 +++++++-
 src/vue/checkboxitem.vue                               | 10 +++++-----
 src/vue/question-comment.vue                           |  4 ++--
 src/vue/question-other.vue                             |  4 ++--
 src/vue/radiogroup.vue                                 |  8 +++++++-
 src/vue/radiogroupitem.vue                             |  2 +-
 16 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/packages/survey-angular-ui/src/comment-other.component.html b/packages/survey-angular-ui/src/comment-other.component.html
index 43878fb271..d51b57c735 100644
--- a/packages/survey-angular-ui/src/comment-other.component.html
+++ b/packages/survey-angular-ui/src/comment-other.component.html
@@ -1,4 +1,4 @@
-<textarea *ngIf="!question.isReadOnlyRenderDiv()" [id]="otherId" [attr.maxlength]="question.getOthersMaxLength()"  [attr.aria-required]="question.ariaRequired" [attr.aria-label]="question.ariaLabel" [attr.placeholder]="otherPlaceholder" 
+<textarea *ngIf="!question.isReadOnlyRenderDiv()" [id]="otherId" [attr.maxlength]="question.getOthersMaxLength()"  [attr.aria-required]="question.ariaRequired || question.a11y_input_ariaRequired" [attr.aria-label]="question.ariaLabel || question.a11y_input_ariaLabel" [attr.placeholder]="otherPlaceholder" 
   [value]="otherValue"
   [style.resize]="question.resizeStyle"
   [disabled]="question.isInputReadOnly"
diff --git a/packages/survey-angular-ui/src/comment.component.html b/packages/survey-angular-ui/src/comment.component.html
index 9e933a7261..c3f4422d52 100644
--- a/packages/survey-angular-ui/src/comment.component.html
+++ b/packages/survey-angular-ui/src/comment.component.html
@@ -1,4 +1,4 @@
-<textarea *ngIf="!question.isReadOnlyRenderDiv()" [id]="question.commentId" [attr.maxlength]="question.getOthersMaxLength()"  [attr.aria-required]="question.ariaRequired" [attr.aria-label]="question.ariaLabel" [attr.placeholder]="question.renderedCommentPlaceholder" 
+<textarea *ngIf="!question.isReadOnlyRenderDiv()" [id]="question.commentId" [attr.maxlength]="question.getOthersMaxLength()"  [attr.aria-required]="question.ariaRequired || question.a11y_input_ariaRequired" [attr.aria-label]="question.ariaLabel || question.a11y_input_ariaLabel" [attr.placeholder]="question.renderedCommentPlaceholder" 
   [value]="comment"
   [style.resize]="question.resizeStyle"
   [disabled]="question.isInputReadOnly"
diff --git a/packages/survey-angular-ui/src/questions/checkbox-item.component.html b/packages/survey-angular-ui/src/questions/checkbox-item.component.html
index 6071ae5e0d..a467c129f2 100644
--- a/packages/survey-angular-ui/src/questions/checkbox-item.component.html
+++ b/packages/survey-angular-ui/src/questions/checkbox-item.component.html
@@ -1,5 +1,5 @@
-<input *ngIf="model == question.selectAllItem" role="option" type="checkbox" [name]="question.name" [id]="question.getItemId(model)" [attr.aria-describedby]="question.ariaDescribedBy" [class]="question.cssClasses.itemControl"
+<input *ngIf="model == question.selectAllItem" type="checkbox" [name]="question.name" [id]="question.getItemId(model)" [class]="question.cssClasses.itemControl"
   [disabled]="!question.getItemEnabled(model)" [checked]="question.isAllSelected" [value]="''" (change)="onSelectAllChange($event)"/>
-<input *ngIf="model != question.selectAllItem" role="option" type="checkbox" [name]="question.name" [id]="question.getItemId(model)" [attr.aria-describedby]="question.ariaDescribedBy" [class]="question.cssClasses.itemControl"
+<input *ngIf="model != question.selectAllItem" type="checkbox" [name]="question.name" [id]="question.getItemId(model)" [class]="question.cssClasses.itemControl"
   [disabled]="!question.getItemEnabled(model)" [checked]="question.isItemSelected(model)" [value]="model.value" (change)="onChange($event)"/>
 <ng-content></ng-content>
\ No newline at end of file
diff --git a/packages/survey-angular-ui/src/questions/selectbase-item.html b/packages/survey-angular-ui/src/questions/selectbase-item.html
index 53389fcb03..e27d2551eb 100644
--- a/packages/survey-angular-ui/src/questions/selectbase-item.html
+++ b/packages/survey-angular-ui/src/questions/selectbase-item.html
@@ -1,10 +1,10 @@
 <ng-template #template>
   <div role="presentation" [class]="question.getItemClass(model)">
     <ng-container [ngSwitch]="inputType">
-      <label *ngSwitchCase="'checkbox'" [class]="question.getLabelClass(model)"  [attr.aria-label]="question.getAriaItemLabel(model)" [model]="model" [question]="question" sv-ng-checkbox-item>
+      <label *ngSwitchCase="'checkbox'" [class]="question.getLabelClass(model)" [model]="model" [question]="question" sv-ng-checkbox-item>
         <ng-container *ngTemplateOutlet="itemDecorator"></ng-container>
       </label>
-      <label *ngSwitchCase="'radio'" (mousedown)="question.onMouseDown()" [class]="question.getLabelClass(model)"  [attr.aria-label]="question.getAriaItemLabel(model)" [model]="model" [question]="question" sv-ng-radiogroup-item>
+      <label *ngSwitchCase="'radio'" (mousedown)="question.onMouseDown()" [class]="question.getLabelClass(model)" [model]="model" [question]="question" sv-ng-radiogroup-item>
         <ng-container *ngTemplateOutlet="itemDecorator"></ng-container>
       </label>
     </ng-container>
diff --git a/packages/survey-angular-ui/src/questions/selectbase.component.html b/packages/survey-angular-ui/src/questions/selectbase.component.html
index 7ba77070e7..652593abcb 100644
--- a/packages/survey-angular-ui/src/questions/selectbase.component.html
+++ b/packages/survey-angular-ui/src/questions/selectbase.component.html
@@ -1,4 +1,10 @@
-<fieldset [class]="model.getSelectBaseRootCss()" role="presentation" #contentElement>
+<fieldset [class]="model.getSelectBaseRootCss()" #contentElement 
+  [attr.aria-required]="model.a11y_input_ariaRequired"
+  [attr.aria-label]="model.a11y_input_ariaLabel"
+  [attr.aria-labelledby]="model.a11y_input_ariaLabelledBy"
+  [attr.aria-invalid]="model.a11y_input_ariaInvalid"
+  [attr.aria-describedby]="model.a11y_input_ariaDescribedBy"
+>
   <legend *ngIf="showLegend" role="presentation" class="sv-hidden"></legend>
   <ng-container *ngIf="model.hasHeadItems">
     <ng-container *ngFor="let item of model.headItems; trackBy: trackItemBy">
diff --git a/packages/survey-vue3-ui/src/QuestionComment.vue b/packages/survey-vue3-ui/src/QuestionComment.vue
index 9ba25607b1..be2ac8243a 100644
--- a/packages/survey-vue3-ui/src/QuestionComment.vue
+++ b/packages/survey-vue3-ui/src/QuestionComment.vue
@@ -11,8 +11,8 @@
     :value="question.comment"
     :maxlength="question.getOthersMaxLength()"
     :placeholder="question.renderedCommentPlaceholder"
-    :aria-label="question.ariaLabel"
-    :aria-required="question.ariaRequired"
+    :aria-label="question.ariaLabel || question.a11y_input_ariaLabel"
+    :aria-required="question.ariaRequired  || question.a11y_input_ariaRequired"
     v-bind:style="{ resize: question.resizeStyle }"
     @change="
       (e) => {
diff --git a/packages/survey-vue3-ui/src/QuestionOther.vue b/packages/survey-vue3-ui/src/QuestionOther.vue
index 9f0e4c2040..833555256d 100644
--- a/packages/survey-vue3-ui/src/QuestionOther.vue
+++ b/packages/survey-vue3-ui/src/QuestionOther.vue
@@ -9,8 +9,8 @@
       :value="question.otherValue"
       :maxlength="question.getOthersMaxLength()"
       :placeholder="question.otherPlaceholder"
-      :aria-label="question.ariaLabel"
-      :aria-required="question.ariaRequired"
+      :aria-label="question.ariaLabel || question.a11y_input_ariaLabel"
+      :aria-required="question.ariaRequired || question.a11y_input_ariaRequired"
       v-bind:style="{ resize: question.resizeStyle }"
       @change="
         (e) => {
diff --git a/src/knockout/templates/comment.html b/src/knockout/templates/comment.html
index d98672feb1..c7a5a84aa0 100644
--- a/src/knockout/templates/comment.html
+++ b/src/knockout/templates/comment.html
@@ -1,6 +1,6 @@
 <script type="text/html" id="survey-comment">
   <!--ko if: !question.isReadOnlyRenderDiv() -->
-<textarea data-bind="attr: { id: question.commentId, maxLength: question.getOthersMaxLength(), 'aria-required': question.ariaRequired, 'aria-label': question.ariaLabel, placeholder: question.renderedCommentPlaceholder }, 
+<textarea data-bind="attr: { id: question.commentId, maxLength: question.getOthersMaxLength(), 'aria-required': question.ariaRequired || question.a11y_input_ariaRequired, 'aria-label': question.ariaLabel || question.a11y_input_ariaLabel, placeholder: question.renderedCommentPlaceholder }, 
         event: { input: function(s, e) { $data.question.onCommentInput(s, e); } }, 
         value: $data.question.comment, 
         visible: $data.visible,
@@ -15,7 +15,7 @@
 </script>
 <script type="text/html" id="survey-other">
   <!--ko if: !question.isReadOnlyRenderDiv() -->
-<textarea data-bind="attr: { id: question.otherId, maxLength: question.getOthersMaxLength(), 'aria-required': question.ariaRequired, 'aria-label': question.ariaLabel, placeholder: question.otherPlaceholder }, 
+<textarea data-bind="attr: { id: question.otherId, maxLength: question.getOthersMaxLength(), 'aria-required': question.ariaRequired || question.a11y_input_ariaRequired, 'aria-label': question.ariaLabel || question.a11y_input_ariaLabel, placeholder: question.otherPlaceholder }, 
         event: { input: function(s, e) { $data.question.onOtherValueInput(s, e); } }, 
         value: $data.question.otherValue, 
         visible: $data.visible,
diff --git a/src/knockout/templates/question-checkbox.html b/src/knockout/templates/question-checkbox.html
index c2b8f6f6d1..4c0df14c7b 100644
--- a/src/knockout/templates/question-checkbox.html
+++ b/src/knockout/templates/question-checkbox.html
@@ -1,5 +1,5 @@
 <script type="text/html" id="survey-question-checkbox">
-  <fieldset data-bind="css: question.getSelectBaseRootCss()" role="presentation">
+  <fieldset data-bind="css: question.getSelectBaseRootCss(), attr: { 'aria-required': question.a11y_input_ariaRequired, 'aria-labelledby': question.a11y_input_ariaLabelledBy, 'aria-invalid': question.a11y_input_ariaInvalid, 'aria-describedby': question.a11y_input_ariaDescribedBy, 'aria-label': question.a11y_input_ariaLabel }">
       <legend role="presentation" class="sv-hidden"></legend>
       <!-- ko if: question.hasHeadItems  -->
         <!-- ko foreach: { data: question.headItems, as: 'item', afterRender: question.koAfterRender }  -->
@@ -48,12 +48,12 @@
 </script>
 <script type="text/html" id="survey-checkbox-item">
   <div role="presentation" data-bind="css: question.getItemClass($data)">
-      <label data-bind="css: question.getLabelClass($data), attr: { 'aria-label': question.getAriaItemLabel($data) }">
+      <label data-bind="css: question.getLabelClass($data)">
           <!-- ko if: $data == question.selectAllItem -->
-          <input role="option" type="checkbox" value="" data-bind="attr: {name: question.name, id: question.getItemId($data), 'aria-describedby': question.ariaDescribedBy }, checked: question.koAllSelected, enable: question.getItemEnabled($data), css: question.cssClasses.itemControl"/>
+          <input type="checkbox" value="" data-bind="attr: {name: question.name, id: question.getItemId($data)}, checked: question.koAllSelected, enable: question.getItemEnabled($data), css: question.cssClasses.itemControl"/>
           <!-- /ko -->
           <!-- ko if: $data != question.selectAllItem -->
-          <input role="option" type="checkbox" data-bind="attr: {name: question.name, id: question.getItemId($data), 'aria-describedby': question.ariaDescribedBy }, checkedValue: $data.value, checked: question.koValue, enable: question.getItemEnabled($data), css: question.cssClasses.itemControl"/>
+          <input type="checkbox" data-bind="attr: {name: question.name, id: question.getItemId($data)}, checkedValue: $data.value, checked: question.koValue, enable: question.getItemEnabled($data), css: question.cssClasses.itemControl"/>
           <!-- /ko -->
               <!-- ko if: question.cssClasses.materialDecorator -->
               <span data-bind="css: question.cssClasses.materialDecorator">
diff --git a/src/knockout/templates/question-radiogroup.html b/src/knockout/templates/question-radiogroup.html
index 24d4051b87..e7a147bbce 100644
--- a/src/knockout/templates/question-radiogroup.html
+++ b/src/knockout/templates/question-radiogroup.html
@@ -1,6 +1,6 @@
 <script type="text/html" id="survey-question-radiogroup">
 
-  <fieldset data-bind="css: question.getSelectBaseRootCss()" role="presentation">
+  <fieldset data-bind="css: question.getSelectBaseRootCss(), attr: { 'aria-required': question.a11y_input_ariaRequired, 'aria-labelledby': question.a11y_input_ariaLabelledBy, 'aria-invalid': question.a11y_input_ariaInvalid, 'aria-describedby': question.a11y_input_ariaDescribedBy, 'aria-label': question.a11y_input_ariaLabel }">
     <!-- ko ifnot: question.hasColumns -->
       <!-- ko if: question.blockedRow -->
       <div data-bind="css: question.cssClasses.rootRow">
@@ -52,7 +52,7 @@
 </script>
 <script type="text/html" id="survey-radiogroup-item">
   <div role="presentation" data-bind="css: question.getItemClass($data)">
-    <label data-bind="css: question.getLabelClass($data), attr: { 'aria-label': question.getAriaItemLabel($data) }, event: { mousedown: question.koMouseDown }">
+    <label data-bind="css: question.getLabelClass($data), event: { mousedown: question.koMouseDown }">
       <input
         type="radio"
         data-bind="attr: { name: question.questionName, id: question.getItemId($data), 'aria-describedby': question.ariaDescribedBy }, checkedValue: $data.value, checked: question.renderedValue, enable: question.getItemEnabled($data), css: question.cssClasses.itemControl"
diff --git a/src/vue/checkbox.vue b/src/vue/checkbox.vue
index b5e4716bb7..1767a0aa68 100644
--- a/src/vue/checkbox.vue
+++ b/src/vue/checkbox.vue
@@ -1,5 +1,11 @@
 <template>
-  <fieldset :class="question.getSelectBaseRootCss()" role="presentation">
+  <fieldset :class="question.getSelectBaseRootCss()" 
+    :aria-required="question.a11y_input_ariaRequired"
+    :aria-label="question.a11y_input_ariaLabel"
+    :aria-labelledby="question.a11y_input_ariaLabelledBy"
+    :aria-invalid="question.a11y_input_ariaInvalid"
+    :aria-describedby="question.a11y_input_ariaDescribedBy"
+  >
     <legend role="presentation" class="sv-hidden"></legend>
     <survey-checkbox-item
         v-for="(item, index) in question.headItems"
diff --git a/src/vue/checkboxitem.vue b/src/vue/checkboxitem.vue
index 1dfd4819d6..f0c1b59c8d 100644
--- a/src/vue/checkboxitem.vue
+++ b/src/vue/checkboxitem.vue
@@ -1,13 +1,13 @@
 <template>
   <div role="presentation">
-    <label :class="question.getLabelClass(item)" :aria-label="question.getAriaItemLabel(item)">
-      <input v-if="item == question.selectAllItem" role="option" type="checkbox" :name="question.name"
+    <label :class="question.getLabelClass(item)">
+      <input v-if="item == question.selectAllItem" type="checkbox" :name="question.name"
         :value="isAllSelected" v-model="isAllSelected" :id="question.getItemId(item)"
-        :disabled="!question.getItemEnabled(item)" :aria-describedby="question.ariaDescribedBy"
-        :class="question.cssClasses.itemControl" /><input v-if="item != question.selectAllItem" role="option"
+        :disabled="!question.getItemEnabled(item)" :class="question.cssClasses.itemControl" />
+      <input v-if="item != question.selectAllItem" 
         type="checkbox" :name="question.name" :value="item.value" v-model="question.renderedValue"
         :id="question.getItemId(item)" :disabled="!question.getItemEnabled(item)"
-        :aria-describedby="question.ariaDescribedBy" :class="question.cssClasses.itemControl" /><span
+        :class="question.cssClasses.itemControl" /><span
         v-if="question.cssClasses.materialDecorator" :class="question.cssClasses.materialDecorator">
         <svg v-if="question.itemSvgIcon" :class="question.cssClasses.itemDecorator">
           <use :xlink:href="question.itemSvgIcon"></use>
diff --git a/src/vue/question-comment.vue b/src/vue/question-comment.vue
index d41a380688..086897ab30 100644
--- a/src/vue/question-comment.vue
+++ b/src/vue/question-comment.vue
@@ -8,8 +8,8 @@
       :value="question.comment"
       :maxlength="question.getOthersMaxLength()"
       :placeholder="question.renderedCommentPlaceholder"
-      :aria-label="question.ariaLabel"
-      :aria-required="question.ariaRequired"
+      :aria-label="question.ariaLabel || question.a11y_input_ariaLabel"
+      :aria-required="question.ariaRequired || question.a11y_input_ariaRequired"
       v-bind:style="{ resize: question.resizeStyle }"
       @change="(e) => { question.onCommentChange(e) }"
       @input="(e) => { question.onCommentInput(e) }"
diff --git a/src/vue/question-other.vue b/src/vue/question-other.vue
index 4e20fc88e6..4498844476 100644
--- a/src/vue/question-other.vue
+++ b/src/vue/question-other.vue
@@ -9,8 +9,8 @@
       :value="question.otherValue"
       :maxlength="question.getOthersMaxLength()"
       :placeholder="question.otherPlaceholder"
-      :aria-label="question.ariaLabel"
-      :aria-required="question.ariaRequired"
+      :aria-label="question.ariaLabel || question.a11y_input_ariaLabel"
+      :aria-required="question.ariaRequired || question.a11y_input_ariaRequired"
       v-bind:style="{ resize: question.resizeStyle }"
       @change="(e) => { question.onOtherValueChange(e) }"
       @input="(e) => { question.onOtherValueInput(e) }"
diff --git a/src/vue/radiogroup.vue b/src/vue/radiogroup.vue
index b066c9cc6a..f598f088d8 100644
--- a/src/vue/radiogroup.vue
+++ b/src/vue/radiogroup.vue
@@ -1,5 +1,11 @@
 <template>
-  <fieldset role="presentation" :class="question.getSelectBaseRootCss()">
+  <fieldset :class="question.getSelectBaseRootCss()" 
+    :aria-required="question.a11y_input_ariaRequired"
+    :aria-label="question.a11y_input_ariaLabel"
+    :aria-labelledby="question.a11y_input_ariaLabelledBy"
+    :aria-invalid="question.a11y_input_ariaInvalid"
+    :aria-describedby="question.a11y_input_ariaDescribedBy"
+  >
     <survey-radiogroup-item
       v-if="!question.hasColumns && !question.blockedRow"
       v-for="(item, index) in question.visibleChoices"
diff --git a/src/vue/radiogroupitem.vue b/src/vue/radiogroupitem.vue
index 85f62f47d9..64cb61b74f 100644
--- a/src/vue/radiogroupitem.vue
+++ b/src/vue/radiogroupitem.vue
@@ -1,6 +1,6 @@
 <template>
   <div role="presentation">
-    <label @mousedown="question.onMouseDown()" :class="getLabelClass(item)" :aria-label="question.getAriaItemLabel(item)">
+    <label @mousedown="question.onMouseDown()" :class="getLabelClass(item)">
       <input
         type="radio"
         :name="question.questionName"

From e54cac36b1bf3a6bc43fdc9a4d1376630757dc7c Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Mon, 11 Sep 2023 14:13:05 +0400
Subject: [PATCH 7/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (fix markups-4)

---
 packages/survey-vue3-ui/src/Checkbox.vue        | 8 +++++++-
 packages/survey-vue3-ui/src/CheckboxItem.vue    | 5 -----
 packages/survey-vue3-ui/src/QuestionComment.vue | 2 +-
 packages/survey-vue3-ui/src/Radiogroup.vue      | 6 +++++-
 packages/survey-vue3-ui/src/RadiogroupItem.vue  | 1 -
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/survey-vue3-ui/src/Checkbox.vue b/packages/survey-vue3-ui/src/Checkbox.vue
index b73ddcf3bc..4bff42ce19 100644
--- a/packages/survey-vue3-ui/src/Checkbox.vue
+++ b/packages/survey-vue3-ui/src/Checkbox.vue
@@ -1,5 +1,11 @@
 <template>
-  <fieldset :class="question.getSelectBaseRootCss()" role="presentation">
+  <fieldset :class="question.getSelectBaseRootCss()" 
+    :aria-required="question.a11y_input_ariaRequired"
+    :aria-label="question.a11y_input_ariaLabel"
+    :aria-labelledby="question.a11y_input_ariaLabelledBy"
+    :aria-invalid="question.a11y_input_ariaInvalid"
+    :aria-describedby="question.a11y_input_ariaDescribedBy"
+  >
     <legend role="presentation" class="sv-hidden"></legend>
     <template v-if="question.hasHeadItems">
       <survey-checkbox-item
diff --git a/packages/survey-vue3-ui/src/CheckboxItem.vue b/packages/survey-vue3-ui/src/CheckboxItem.vue
index 1707834259..32c5d4f2dd 100644
--- a/packages/survey-vue3-ui/src/CheckboxItem.vue
+++ b/packages/survey-vue3-ui/src/CheckboxItem.vue
@@ -2,29 +2,24 @@
   <div role="presentation">
     <label
       :class="question.getLabelClass(item)"
-      :aria-label="question.getAriaItemLabel(item)"
     >
       <input
         v-if="item == question.selectAllItem"
-        role="option"
         type="checkbox"
         :name="question.name"
         :value="isAllSelected"
         v-model="isAllSelected"
         :id="question.getItemId(item)"
         :disabled="!question.getItemEnabled(item)"
-        :aria-describedby="question.ariaDescribedBy"
         :class="question.cssClasses.itemControl"
       /><input
         v-if="item != question.selectAllItem"
-        role="option"
         type="checkbox"
         :name="question.name"
         :value="item.value"
         v-model="question.renderedValue"
         :id="question.getItemId(item)"
         :disabled="!question.getItemEnabled(item)"
-        :aria-describedby="question.ariaDescribedBy"
         :class="question.cssClasses.itemControl"
       /><span
         v-if="question.cssClasses.materialDecorator"
diff --git a/packages/survey-vue3-ui/src/QuestionComment.vue b/packages/survey-vue3-ui/src/QuestionComment.vue
index be2ac8243a..927e204b12 100644
--- a/packages/survey-vue3-ui/src/QuestionComment.vue
+++ b/packages/survey-vue3-ui/src/QuestionComment.vue
@@ -12,7 +12,7 @@
     :maxlength="question.getOthersMaxLength()"
     :placeholder="question.renderedCommentPlaceholder"
     :aria-label="question.ariaLabel || question.a11y_input_ariaLabel"
-    :aria-required="question.ariaRequired  || question.a11y_input_ariaRequired"
+    :aria-required="question.ariaRequired || question.a11y_input_ariaRequired"
     v-bind:style="{ resize: question.resizeStyle }"
     @change="
       (e) => {
diff --git a/packages/survey-vue3-ui/src/Radiogroup.vue b/packages/survey-vue3-ui/src/Radiogroup.vue
index bac8d45964..afecf89727 100644
--- a/packages/survey-vue3-ui/src/Radiogroup.vue
+++ b/packages/survey-vue3-ui/src/Radiogroup.vue
@@ -1,8 +1,12 @@
 <template>
   <fieldset
-    role="presentation"
     :class="question.getSelectBaseRootCss()"
     ref="root"
+    :aria-required="question.a11y_input_ariaRequired"
+    :aria-label="question.a11y_input_ariaLabel"
+    :aria-labelledby="question.a11y_input_ariaLabelledBy"
+    :aria-invalid="question.a11y_input_ariaInvalid"
+    :aria-describedby="question.a11y_input_ariaDescribedBy"
   >
     <survey-radiogroup-item
       v-if="!question.hasColumns && !question.blockedRow"
diff --git a/packages/survey-vue3-ui/src/RadiogroupItem.vue b/packages/survey-vue3-ui/src/RadiogroupItem.vue
index d38b55b77e..2f4e2dd96d 100644
--- a/packages/survey-vue3-ui/src/RadiogroupItem.vue
+++ b/packages/survey-vue3-ui/src/RadiogroupItem.vue
@@ -3,7 +3,6 @@
     <label
       @mousedown="question.onMouseDown()"
       :class="getLabelClass(item)"
-      :aria-label="question.getAriaItemLabel(item)"
     >
       <input
         type="radio"

From f924a722c1807b1c850d40bd57f043ef0b8eb9f6 Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Tue, 12 Sep 2023 16:25:08 +0400
Subject: [PATCH 8/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (fix ff tests)

---
 .../src/questions/selectbase.component.html    |  1 +
 packages/survey-vue3-ui/src/Checkbox.vue       |  1 +
 packages/survey-vue3-ui/src/Radiogroup.vue     |  1 +
 src/knockout/templates/question-checkbox.html  |  2 +-
 .../templates/question-radiogroup.html         |  2 +-
 src/question.ts                                |  3 +++
 src/question_checkbox.ts                       |  3 +++
 src/question_radiogroup.ts                     |  3 +++
 src/react/reactquestion_checkbox.tsx           |  1 +
 src/react/reactquestion_radiogroup.tsx         |  1 +
 src/vue/checkbox.vue                           |  1 +
 src/vue/radiogroup.vue                         |  1 +
 testCafe/questions/radiogroup.js               | 16 ++++++++--------
 testCafe/questions/ranking.js                  | 18 +++++++++---------
 .../checkbox-columns-head-foot.snap.html       |  2 +-
 .../checkbox-columns-mobile.snap.html          |  2 +-
 .../checkbox-columns-no-head-foot.snap.html    |  2 +-
 .../snapshots/checkbox-columns.snap.html       |  2 +-
 .../snapshots/checkbox-comment-V2.snap.html    |  2 +-
 .../markup/snapshots/checkbox-modern.snap.html |  2 +-
 .../snapshots/checkbox-other-V2.snap.html      |  2 +-
 .../checkbox-other-maxlength.snap.html         |  2 +-
 .../markup/snapshots/checkbox-other.snap.html  |  2 +-
 .../checkbox-readonly-selected.snap.html       |  2 +-
 .../snapshots/checkbox-readonly.snap.html      |  2 +-
 .../snapshots/checkbox-row-head-foot.snap.html |  2 +-
 .../checkbox-row-no-head-foot.snap.html        |  2 +-
 tests/markup/snapshots/checkbox-v2.snap.html   |  2 +-
 tests/markup/snapshots/checkbox.snap.html      |  2 +-
 ...comment-into-question-allowResize.snap.html |  2 +-
 ...c-show-in-multiple-columns-mobile.snap.html |  4 ++--
 .../snapshots/radiogroup-clear.snap.html       |  2 +-
 .../radiogroup-columns-head-foot.snap.html     |  2 +-
 .../radiogroup-columns-mobile.snap.html        |  2 +-
 .../radiogroup-columns-no-head-foot.snap.html  |  2 +-
 .../snapshots/radiogroup-columns.snap.html     |  2 +-
 .../snapshots/radiogroup-modern.snap.html      |  2 +-
 .../snapshots/radiogroup-other.snap.html       |  2 +-
 .../radiogroup-readonly-selected.snap.html     |  2 +-
 .../snapshots/radiogroup-readonly.snap.html    |  2 +-
 .../radiogroup-row-head-foot.snap.html         |  2 +-
 .../radiogroup-row-no-head-foot.snap.html      |  2 +-
 tests/markup/snapshots/radiogroup-v2.snap.html |  2 +-
 tests/markup/snapshots/radiogroup.snap.html    |  2 +-
 44 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/packages/survey-angular-ui/src/questions/selectbase.component.html b/packages/survey-angular-ui/src/questions/selectbase.component.html
index 652593abcb..713e0e4800 100644
--- a/packages/survey-angular-ui/src/questions/selectbase.component.html
+++ b/packages/survey-angular-ui/src/questions/selectbase.component.html
@@ -1,4 +1,5 @@
 <fieldset [class]="model.getSelectBaseRootCss()" #contentElement 
+  [attr.role]="model.a11y_input_ariaRole"
   [attr.aria-required]="model.a11y_input_ariaRequired"
   [attr.aria-label]="model.a11y_input_ariaLabel"
   [attr.aria-labelledby]="model.a11y_input_ariaLabelledBy"
diff --git a/packages/survey-vue3-ui/src/Checkbox.vue b/packages/survey-vue3-ui/src/Checkbox.vue
index 4bff42ce19..df7b321d34 100644
--- a/packages/survey-vue3-ui/src/Checkbox.vue
+++ b/packages/survey-vue3-ui/src/Checkbox.vue
@@ -1,5 +1,6 @@
 <template>
   <fieldset :class="question.getSelectBaseRootCss()" 
+    :role="question.a11y_input_ariaRole"
     :aria-required="question.a11y_input_ariaRequired"
     :aria-label="question.a11y_input_ariaLabel"
     :aria-labelledby="question.a11y_input_ariaLabelledBy"
diff --git a/packages/survey-vue3-ui/src/Radiogroup.vue b/packages/survey-vue3-ui/src/Radiogroup.vue
index afecf89727..2158dd3de4 100644
--- a/packages/survey-vue3-ui/src/Radiogroup.vue
+++ b/packages/survey-vue3-ui/src/Radiogroup.vue
@@ -2,6 +2,7 @@
   <fieldset
     :class="question.getSelectBaseRootCss()"
     ref="root"
+    :role="question.a11y_input_ariaRole"
     :aria-required="question.a11y_input_ariaRequired"
     :aria-label="question.a11y_input_ariaLabel"
     :aria-labelledby="question.a11y_input_ariaLabelledBy"
diff --git a/src/knockout/templates/question-checkbox.html b/src/knockout/templates/question-checkbox.html
index 4c0df14c7b..dc39a7466a 100644
--- a/src/knockout/templates/question-checkbox.html
+++ b/src/knockout/templates/question-checkbox.html
@@ -1,5 +1,5 @@
 <script type="text/html" id="survey-question-checkbox">
-  <fieldset data-bind="css: question.getSelectBaseRootCss(), attr: { 'aria-required': question.a11y_input_ariaRequired, 'aria-labelledby': question.a11y_input_ariaLabelledBy, 'aria-invalid': question.a11y_input_ariaInvalid, 'aria-describedby': question.a11y_input_ariaDescribedBy, 'aria-label': question.a11y_input_ariaLabel }">
+  <fieldset data-bind="css: question.getSelectBaseRootCss(), attr: { 'role': question.a11y_input_ariaRole, 'aria-required': question.a11y_input_ariaRequired, 'aria-labelledby': question.a11y_input_ariaLabelledBy, 'aria-invalid': question.a11y_input_ariaInvalid, 'aria-describedby': question.a11y_input_ariaDescribedBy, 'aria-label': question.a11y_input_ariaLabel }">
       <legend role="presentation" class="sv-hidden"></legend>
       <!-- ko if: question.hasHeadItems  -->
         <!-- ko foreach: { data: question.headItems, as: 'item', afterRender: question.koAfterRender }  -->
diff --git a/src/knockout/templates/question-radiogroup.html b/src/knockout/templates/question-radiogroup.html
index e7a147bbce..42c9ad54b2 100644
--- a/src/knockout/templates/question-radiogroup.html
+++ b/src/knockout/templates/question-radiogroup.html
@@ -1,6 +1,6 @@
 <script type="text/html" id="survey-question-radiogroup">
 
-  <fieldset data-bind="css: question.getSelectBaseRootCss(), attr: { 'aria-required': question.a11y_input_ariaRequired, 'aria-labelledby': question.a11y_input_ariaLabelledBy, 'aria-invalid': question.a11y_input_ariaInvalid, 'aria-describedby': question.a11y_input_ariaDescribedBy, 'aria-label': question.a11y_input_ariaLabel }">
+  <fieldset data-bind="css: question.getSelectBaseRootCss(), attr: { 'role': question.a11y_input_ariaRole, 'aria-required': question.a11y_input_ariaRequired, 'aria-labelledby': question.a11y_input_ariaLabelledBy, 'aria-invalid': question.a11y_input_ariaInvalid, 'aria-describedby': question.a11y_input_ariaDescribedBy, 'aria-label': question.a11y_input_ariaLabel }">
     <!-- ko ifnot: question.hasColumns -->
       <!-- ko if: question.blockedRow -->
       <div data-bind="css: question.cssClasses.rootRow">
diff --git a/src/question.ts b/src/question.ts
index 7dd1cd9e0c..3f1db0cdcf 100644
--- a/src/question.ts
+++ b/src/question.ts
@@ -2358,6 +2358,9 @@ export class Question extends SurveyElement<Question>
   //EO a11y
 
   //new a11y
+  public get a11y_input_ariaRole(): string {
+    return null;
+  }
   public get a11y_input_ariaRequired(): "true" | "false" {
     return this.isRequired ? "true" : "false";
   }
diff --git a/src/question_checkbox.ts b/src/question_checkbox.ts
index 16fcc50002..e028fc73fc 100644
--- a/src/question_checkbox.ts
+++ b/src/question_checkbox.ts
@@ -582,6 +582,9 @@ export class QuestionCheckboxModel extends QuestionCheckboxBase {
   public get isNewA11yStructure(): boolean {
     return true;
   }
+  public get a11y_input_ariaRole(): string {
+    return "listbox";
+  }
   // EO a11y
 }
 Serializer.addClass(
diff --git a/src/question_radiogroup.ts b/src/question_radiogroup.ts
index a96ea0e3e6..69bb21cacc 100644
--- a/src/question_radiogroup.ts
+++ b/src/question_radiogroup.ts
@@ -82,6 +82,9 @@ export class QuestionRadiogroupModel extends QuestionCheckboxBase {
   public get isNewA11yStructure(): boolean {
     return true;
   }
+  public get a11y_input_ariaRole(): string {
+    return "radiogroup";
+  }
   // EO a11y
 }
 
diff --git a/src/react/reactquestion_checkbox.tsx b/src/react/reactquestion_checkbox.tsx
index 8328456500..176cbbdede 100644
--- a/src/react/reactquestion_checkbox.tsx
+++ b/src/react/reactquestion_checkbox.tsx
@@ -22,6 +22,7 @@ export class SurveyQuestionCheckbox extends SurveyQuestionElementBase {
       <fieldset
         className={this.question.getSelectBaseRootCss()}
         ref={(fieldset) => (this.setControl(fieldset))}
+        role={this.question.a11y_input_ariaRole}
         aria-required={this.question.a11y_input_ariaRequired}
         aria-label={this.question.a11y_input_ariaLabel}
         aria-labelledby={this.question.a11y_input_ariaLabelledBy}
diff --git a/src/react/reactquestion_radiogroup.tsx b/src/react/reactquestion_radiogroup.tsx
index 33670534e7..ed014c7170 100644
--- a/src/react/reactquestion_radiogroup.tsx
+++ b/src/react/reactquestion_radiogroup.tsx
@@ -32,6 +32,7 @@ export class SurveyQuestionRadiogroup extends SurveyQuestionElementBase {
       <fieldset
         className={this.question.getSelectBaseRootCss()}
         ref={(fieldset) => (this.setControl(fieldset))}
+        role={this.question.a11y_input_ariaRole}
         aria-required={this.question.a11y_input_ariaRequired}
         aria-label={this.question.a11y_input_ariaLabel}
         aria-labelledby={this.question.a11y_input_ariaLabelledBy}
diff --git a/src/vue/checkbox.vue b/src/vue/checkbox.vue
index 1767a0aa68..2e4a1b819d 100644
--- a/src/vue/checkbox.vue
+++ b/src/vue/checkbox.vue
@@ -1,5 +1,6 @@
 <template>
   <fieldset :class="question.getSelectBaseRootCss()" 
+    :role="question.a11y_input_ariaRole"
     :aria-required="question.a11y_input_ariaRequired"
     :aria-label="question.a11y_input_ariaLabel"
     :aria-labelledby="question.a11y_input_ariaLabelledBy"
diff --git a/src/vue/radiogroup.vue b/src/vue/radiogroup.vue
index f598f088d8..c94e0ddc29 100644
--- a/src/vue/radiogroup.vue
+++ b/src/vue/radiogroup.vue
@@ -1,5 +1,6 @@
 <template>
   <fieldset :class="question.getSelectBaseRootCss()" 
+    :role="question.a11y_input_ariaRole"
     :aria-required="question.a11y_input_ariaRequired"
     :aria-label="question.a11y_input_ariaLabel"
     :aria-labelledby="question.a11y_input_ariaLabelledBy"
diff --git a/testCafe/questions/radiogroup.js b/testCafe/questions/radiogroup.js
index 0d605035e9..878ddb8147 100644
--- a/testCafe/questions/radiogroup.js
+++ b/testCafe/questions/radiogroup.js
@@ -74,13 +74,13 @@ frameworks.forEach(framework => {
 
     //asc
     await setOptions("car", { choicesOrder: "asc" });
-    await t.expect(chocies.nth(0).find("[aria-label=\"Audi\"]").exists).ok();
-    await t.expect(chocies.nth(3).find("[aria-label=\"BMW\"]").exists).ok();
+    await t.expect(chocies.nth(0).find("[type=\"radio\"]").exists).ok();
+    await t.expect(chocies.nth(3).find("[type=\"radio\"]").exists).ok();
 
     //desc
     await setOptions("car", { choicesOrder: "desc" });
-    await t.expect(chocies.nth(0).find("[aria-label=\"Volkswagen\"]").exists).ok();
-    await t.expect(chocies.nth(3).find("[aria-label=\"Vauxhall\"]").exists).ok();
+    await t.expect(chocies.nth(0).find("[type=\"radio\"]").exists).ok();
+    await t.expect(chocies.nth(3).find("[type=\"radio\"]").exists).ok();
 
     //random
     if (chocies.count === 1) {
@@ -156,7 +156,7 @@ frameworks.forEach(framework => {
 
     await setOptions("car", { hasOther: true, otherText: "Other Test" });
     await setOptions("car", { choicesOrder: "desc" });
-    await t.expect(chocies.nth(11).find("[aria-label=\"Other Test\"]").exists).ok();
+    await t.expect(chocies.nth(11).find("[type=\"radio\"]").exists).ok();
   });
 
   test("choose other", async t => {
@@ -167,8 +167,7 @@ frameworks.forEach(framework => {
 
     const radiogroup = Selector("[role=\"radiogroup\"]");
     const chocies = radiogroup.find("input[type=\"radio\"]").parent("label").parent();
-    const otherText = chocies.nth(11).find("[aria-label=\"Other (describe)\"]");
-
+    const otherText = Selector("[type='radio']").nth(11);
     await t
       .click(otherText)
       .typeText(getOtherInput, "Zaporozec")
@@ -178,6 +177,7 @@ frameworks.forEach(framework => {
     assert.equal(surveyResult.car, "other");
     assert.equal(surveyResult["car-Comment"], "Zaporozec");
   });
+
   test("choose other and storeOthersAsComment=false", async t => {
     const setSurveyOptions = ClientFunction(() => {
       window["survey"].storeOthersAsComment = false;
@@ -189,7 +189,7 @@ frameworks.forEach(framework => {
 
     const radiogroup = Selector("[role=\"radiogroup\"]");
     const chocies = radiogroup.find("input[type=\"radio\"]").parent("label").parent();
-    const otherText = chocies.nth(11).find("[aria-label=\"Other (describe)\"]");
+    const otherText = Selector("[type='radio']").nth(11);
 
     await setSurveyOptions();
     await t
diff --git a/testCafe/questions/ranking.js b/testCafe/questions/ranking.js
index 6a2af6775d..8f743659fa 100644
--- a/testCafe/questions/ranking.js
+++ b/testCafe/questions/ranking.js
@@ -82,13 +82,13 @@ frameworks.forEach((framework) => {
 
   const PriceItem = Selector("span")
     .withText("Please rank the following smartphone features in order of importance:")
-    .parent("[aria-labelledby]")
+    .parent("[data-name]")
     .find("span")
     .withText("Price");
 
   const BatteryItem = Selector("span")
     .withText("Please rank the following smartphone features in order of importance:")
-    .parent("[aria-labelledby]")
+    .parent("[data-name]")
     .find("span")
     .withText("Battery life");
 
@@ -157,28 +157,28 @@ frameworks.forEach((framework) => {
     });
     const rankAudiItem = Selector("span")
       .withText("What car did you enjoy the most?")
-      .parent("[aria-labelledby]")
+      .parent("[data-name]")
       .find("span")
       .withText("Audi");
     const rankMercedesBenzItem = Selector("span")
       .withText("What car did you enjoy the most?")
-      .parent("[aria-labelledby]")
+      .parent("[data-name]")
       .find("span")
       .withText("Mercedes-Benz");
 
     const checkboxAudiItem = Selector("span")
       .withText("What cars have you being drived?")
-      .parent("[aria-labelledby]")
+      .parent("[data-name]")
       .find("span")
       .withText("Audi");
     const checkboxMerscedesItem = Selector("span")
       .withText("What cars have you being drived?")
-      .parent("[aria-labelledby]")
+      .parent("[data-name]")
       .find("span")
       .withText("Mercedes-Benz");
     const checkboxToyotaItem = Selector("span")
       .withText("What cars have you being drived?")
-      .parent("[aria-labelledby]")
+      .parent("[data-name]")
       .find("span")
       .withText("Toyota");
 
@@ -263,13 +263,13 @@ frameworks.forEach((framework) => {
 
     const FirstItem = Selector("span")
       .withText(newName)
-      .parent("[aria-labelledby]")
+      .parent("[data-name]")
       .find("span")
       .withText("one");
 
     const SecondItem = Selector("span")
       .withText(newName)
-      .parent("[aria-labelledby]")
+      .parent("[data-name]")
       .find("span")
       .withText("two");
 
diff --git a/tests/markup/snapshots/checkbox-columns-head-foot.snap.html b/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
index d701928300..1c4f4ed9f9 100644
--- a/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_selectall" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-columns-mobile.snap.html b/tests/markup/snapshots/checkbox-columns-mobile.snap.html
index ad5fcf1388..00f38e2316 100644
--- a/tests/markup/snapshots/checkbox-columns-mobile.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-mobile.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-2" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html b/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
index 18100fde11..9f95fe1870 100644
--- a/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div>
diff --git a/tests/markup/snapshots/checkbox-columns.snap.html b/tests/markup/snapshots/checkbox-columns.snap.html
index 3e92cfc0a4..da61295378 100644
--- a/tests/markup/snapshots/checkbox-columns.snap.html
+++ b/tests/markup/snapshots/checkbox-columns.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div>
diff --git a/tests/markup/snapshots/checkbox-comment-V2.snap.html b/tests/markup/snapshots/checkbox-comment-V2.snap.html
index 4aa4dc5c31..8c829b83c5 100644
--- a/tests/markup/snapshots/checkbox-comment-V2.snap.html
+++ b/tests/markup/snapshots/checkbox-comment-V2.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-modern.snap.html b/tests/markup/snapshots/checkbox-modern.snap.html
index b98adeebd1..c78e088130 100644
--- a/tests/markup/snapshots/checkbox-modern.snap.html
+++ b/tests/markup/snapshots/checkbox-modern.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv-selectbase">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv-selectbase" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv-checkbox sv-checkbox--allowhover sv-item sv-q-col-1 sv-selectbase__item" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-other-V2.snap.html b/tests/markup/snapshots/checkbox-other-V2.snap.html
index 7624d54bfc..330f4017c6 100644
--- a/tests/markup/snapshots/checkbox-other-V2.snap.html
+++ b/tests/markup/snapshots/checkbox-other-V2.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-other-maxlength.snap.html b/tests/markup/snapshots/checkbox-other-maxlength.snap.html
index 13a501fa7d..8e50c62a5c 100644
--- a/tests/markup/snapshots/checkbox-other-maxlength.snap.html
+++ b/tests/markup/snapshots/checkbox-other-maxlength.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-other.snap.html b/tests/markup/snapshots/checkbox-other.snap.html
index 31dbce3b59..746433cf20 100644
--- a/tests/markup/snapshots/checkbox-other.snap.html
+++ b/tests/markup/snapshots/checkbox-other.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-readonly-selected.snap.html b/tests/markup/snapshots/checkbox-readonly-selected.snap.html
index 6b935b16a2..9a2dd6d067 100644
--- a/tests/markup/snapshots/checkbox-readonly-selected.snap.html
+++ b/tests/markup/snapshots/checkbox-readonly-selected.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-readonly.snap.html b/tests/markup/snapshots/checkbox-readonly.snap.html
index 983499b667..845579efd6 100644
--- a/tests/markup/snapshots/checkbox-readonly.snap.html
+++ b/tests/markup/snapshots/checkbox-readonly.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-row-head-foot.snap.html b/tests/markup/snapshots/checkbox-row-head-foot.snap.html
index c1b81c3e57..04ab1fa949 100644
--- a/tests/markup/snapshots/checkbox-row-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-row-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_selectall" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html b/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
index 33f8d18a39..0ad7df9f31 100644
--- a/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_selectall" role="presentation">
diff --git a/tests/markup/snapshots/checkbox-v2.snap.html b/tests/markup/snapshots/checkbox-v2.snap.html
index 24f28819bb..7d39849d56 100644
--- a/tests/markup/snapshots/checkbox-v2.snap.html
+++ b/tests/markup/snapshots/checkbox-v2.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sd-selectbase">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sd-selectbase" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/checkbox.snap.html b/tests/markup/snapshots/checkbox.snap.html
index 4e769c591a..906196d607 100644
--- a/tests/markup/snapshots/checkbox.snap.html
+++ b/tests/markup/snapshots/checkbox.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
 	<legend class="sv-hidden" role="presentation">
 	</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
diff --git a/tests/markup/snapshots/comment-into-question-allowResize.snap.html b/tests/markup/snapshots/comment-into-question-allowResize.snap.html
index 5cfac6199b..5511471731 100644
--- a/tests/markup/snapshots/comment-into-question-allowResize.snap.html
+++ b/tests/markup/snapshots/comment-into-question-allowResize.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="Item 1">
diff --git a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
index edb6d69575..d5e21d7cd9 100644
--- a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
+++ b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
@@ -25,7 +25,7 @@
 				</td>
 				<td class="sd-table__cell" colspan="1" data-responsive-title="col1" title="col1">
 					<div class="sd-table__question-wrapper">
-						<fieldset aria-invalid="false" aria-label="col1" aria-required="true" class="sd-selectbase sd-selectbase--row">
+						<fieldset aria-invalid="false" aria-label="col1" aria-required="true" class="sd-selectbase sd-selectbase--row" role="radiogroup">
 							<div class="sd-item sd-item--allowhover sd-radio sd-radio--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
 								<label class="sd-selectbase__label">
 									<input class="sd-item__control sd-radio__control sd-visuallyhidden" id="testid0row1cell1i_0" name="col1_testid0row1cell1" type="radio" value="Item 1">
@@ -43,7 +43,7 @@
 				</td>
 				<td class="sd-table__cell" colspan="1" data-responsive-title="col2" title="col2">
 					<div class="sd-table__question-wrapper">
-						<fieldset aria-invalid="false" aria-label="col2" aria-required="true" class="sd-selectbase sd-selectbase--row">
+						<fieldset aria-invalid="false" aria-label="col2" aria-required="true" class="sd-selectbase sd-selectbase--row" role="listbox">
 							<legend class="sv-hidden" role="presentation">
 							</legend>
 							<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
diff --git a/tests/markup/snapshots/radiogroup-clear.snap.html b/tests/markup/snapshots/radiogroup-clear.snap.html
index de8b2886f0..9d6b156679 100644
--- a/tests/markup/snapshots/radiogroup-clear.snap.html
+++ b/tests/markup/snapshots/radiogroup-clear.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html b/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html
index c8327c8665..952f2517a1 100644
--- a/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
diff --git a/tests/markup/snapshots/radiogroup-columns-mobile.snap.html b/tests/markup/snapshots/radiogroup-columns-mobile.snap.html
index 7e3f3565d1..8ebfc7975c 100644
--- a/tests/markup/snapshots/radiogroup-columns-mobile.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns-mobile.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="sv_q_radiogroup sv-q-col-2" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html b/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html
index a9412e17c0..09386160ef 100644
--- a/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns-no-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
diff --git a/tests/markup/snapshots/radiogroup-columns.snap.html b/tests/markup/snapshots/radiogroup-columns.snap.html
index 0469d81821..43bd5bb2b0 100644
--- a/tests/markup/snapshots/radiogroup-columns.snap.html
+++ b/tests/markup/snapshots/radiogroup-columns.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_radiogroup" role="presentation">
diff --git a/tests/markup/snapshots/radiogroup-modern.snap.html b/tests/markup/snapshots/radiogroup-modern.snap.html
index 003d0d81bd..5a2b30c3b1 100644
--- a/tests/markup/snapshots/radiogroup-modern.snap.html
+++ b/tests/markup/snapshots/radiogroup-modern.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv-selectbase">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv-selectbase" role="radiogroup">
 	<div class="sv-item sv-q-col-1 sv-radio sv-radio--allowhover sv-selectbase__item" role="presentation">
 		<label class="sv-selectbase__label">
 			<input class="sv-item__control sv-visuallyhidden" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup-other.snap.html b/tests/markup/snapshots/radiogroup-other.snap.html
index aee026d662..5dea0c62e4 100644
--- a/tests/markup/snapshots/radiogroup-other.snap.html
+++ b/tests/markup/snapshots/radiogroup-other.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup-readonly-selected.snap.html b/tests/markup/snapshots/radiogroup-readonly-selected.snap.html
index 8e8ce6790b..f109e16917 100644
--- a/tests/markup/snapshots/radiogroup-readonly-selected.snap.html
+++ b/tests/markup/snapshots/radiogroup-readonly-selected.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="checked sv_q_radiogroup sv-q-col-1" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input checked="" class="sv_q_radiogroup_control_item" disabled="" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup-readonly.snap.html b/tests/markup/snapshots/radiogroup-readonly.snap.html
index 61ed5e53ee..4bb1de6e10 100644
--- a/tests/markup/snapshots/radiogroup-readonly.snap.html
+++ b/tests/markup/snapshots/radiogroup-readonly.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" disabled="" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup-row-head-foot.snap.html b/tests/markup/snapshots/radiogroup-row-head-foot.snap.html
index 60db89c673..b48ed4c075 100644
--- a/tests/markup/snapshots/radiogroup-row-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-row-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div>
 		<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
 			<label class="sv_q_radiogroup_label">
diff --git a/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html b/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html
index 87e92e84ff..c6f3ad66f6 100644
--- a/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html
+++ b/tests/markup/snapshots/radiogroup-row-no-head-foot.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="sv_q_radiogroup sv_q_radiogroup_inline" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup-v2.snap.html b/tests/markup/snapshots/radiogroup-v2.snap.html
index c9c00cd7ab..b02f5f91a2 100644
--- a/tests/markup/snapshots/radiogroup-v2.snap.html
+++ b/tests/markup/snapshots/radiogroup-v2.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sd-selectbase">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sd-selectbase" role="radiogroup">
 	<div class="sd-item sd-item--allowhover sd-radio sd-radio--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
 		<label class="sd-selectbase__label">
 			<input class="sd-item__control sd-radio__control sd-visuallyhidden" id="testid0i_0" name="name_testid0" type="radio" value="item1">
diff --git a/tests/markup/snapshots/radiogroup.snap.html b/tests/markup/snapshots/radiogroup.snap.html
index 11c696c13e..43730f1804 100644
--- a/tests/markup/snapshots/radiogroup.snap.html
+++ b/tests/markup/snapshots/radiogroup.snap.html
@@ -1,4 +1,4 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc">
+<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc" role="radiogroup">
 	<div class="sv_q_radiogroup sv-q-col-1" role="presentation">
 		<label class="sv_q_radiogroup_label">
 			<input class="sv_q_radiogroup_control_item" id="testid0i_0" name="name_testid0" type="radio" value="item1">

From 7e401c3e1c30c71bfd1b7cbba3bd057dcfe4d35a Mon Sep 17 00:00:00 2001
From: dmitrykurmanov <kurmanov.work@gmail.com>
Date: Wed, 13 Sep 2023 12:38:05 +0400
Subject: [PATCH 9/9] work for the
 https://github.com/surveyjs/survey-library/issues/6859 (review-1)

---
 testCafe/questions/radiogroup.js | 15 +++++++------
 tests/a11y.ts                    | 37 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/testCafe/questions/radiogroup.js b/testCafe/questions/radiogroup.js
index 878ddb8147..a10b67521c 100644
--- a/testCafe/questions/radiogroup.js
+++ b/testCafe/questions/radiogroup.js
@@ -74,13 +74,13 @@ frameworks.forEach(framework => {
 
     //asc
     await setOptions("car", { choicesOrder: "asc" });
-    await t.expect(chocies.nth(0).find("[type=\"radio\"]").exists).ok();
-    await t.expect(chocies.nth(3).find("[type=\"radio\"]").exists).ok();
+    await t.expect(chocies.nth(0).find("label").withExactText("Audi").exists).ok();
+    await t.expect(chocies.nth(3).find("label").withExactText("BMW").exists).ok();
 
     //desc
     await setOptions("car", { choicesOrder: "desc" });
-    await t.expect(chocies.nth(0).find("[type=\"radio\"]").exists).ok();
-    await t.expect(chocies.nth(3).find("[type=\"radio\"]").exists).ok();
+    await t.expect(chocies.nth(0).find("label").withExactText("Volkswagen").exists).ok();
+    await t.expect(chocies.nth(3).find("label").withExactText("Vauxhall").exists).ok();
 
     //random
     if (chocies.count === 1) {
@@ -156,7 +156,7 @@ frameworks.forEach(framework => {
 
     await setOptions("car", { hasOther: true, otherText: "Other Test" });
     await setOptions("car", { choicesOrder: "desc" });
-    await t.expect(chocies.nth(11).find("[type=\"radio\"]").exists).ok();
+    await t.expect(chocies.nth(11).find("label").withExactText("Other Test").exists).ok();
   });
 
   test("choose other", async t => {
@@ -167,7 +167,8 @@ frameworks.forEach(framework => {
 
     const radiogroup = Selector("[role=\"radiogroup\"]");
     const chocies = radiogroup.find("input[type=\"radio\"]").parent("label").parent();
-    const otherText = Selector("[type='radio']").nth(11);
+    const otherText = chocies.nth(11).find("label").withExactText("Other (describe)");
+
     await t
       .click(otherText)
       .typeText(getOtherInput, "Zaporozec")
@@ -189,7 +190,7 @@ frameworks.forEach(framework => {
 
     const radiogroup = Selector("[role=\"radiogroup\"]");
     const chocies = radiogroup.find("input[type=\"radio\"]").parent("label").parent();
-    const otherText = Selector("[type='radio']").nth(11);
+    const otherText = chocies.nth(11).find("label").withExactText("Other (describe)");
 
     await setSurveyOptions();
     await t
diff --git a/tests/a11y.ts b/tests/a11y.ts
index e846e1dcc8..acbd92980e 100644
--- a/tests/a11y.ts
+++ b/tests/a11y.ts
@@ -81,4 +81,41 @@ QUnit.test(
     question.hasErrors();
     assert.equal(question.ariaDescribedBy, null, "aria-describedby is NULL because we don't have any errors");
   }
+);
+
+QUnit.test(
+  "a11y: aria-labelledby",
+  function(assert) {
+    var json = {
+      questions: [
+        {
+          type: "radiogroup",
+          choices: [1, 2, 3],
+          title: "Title",
+          name: "q1",
+          isRequired: true
+        },
+      ],
+    };
+    var survey = new SurveyModel(json);
+    var question = survey.getQuestionByName("q1");
+
+    assert.equal(question.isNewA11yStructure, true, "new a11y structure");
+
+    assert.equal(question.ariaLabel, null, "old aria-label is null");
+    assert.equal(question.ariaRole, null, "old aria-role is null");
+    assert.equal(question.ariaRequired, null, "old aria-required is null");
+    assert.equal(question.ariaInvalid, null, "old aria-invalid is null");
+    assert.equal(question.ariaLabelledBy, null, "old aria-labelledby is null");
+    assert.equal(question.ariaExpanded, null, "old aria-expanded is null");
+    assert.equal(question.ariaDescribedBy, null, "old aria-describedby is null");
+
+    assert.equal(question.a11y_input_ariaLabel, null, "aria-label does not exist because we have a title");
+    assert.equal(question.a11y_input_ariaLabelledBy.indexOf("_ariaTitle") !== -1, true, "aria-labelledby is correct");
+    assert.equal(question.a11y_input_ariaRole, "radiogroup", "aria-role is radiogroup");
+    assert.equal(question.a11y_input_ariaRequired, "true", "aria-required is true");
+    assert.equal(question.a11y_input_ariaInvalid, "false", "aria-invalid is false");
+    assert.equal(question.a11y_input_ariaExpanded, null, "aria-expanded is null");
+    assert.equal(question.a11y_input_ariaDescribedBy, null, "aria-describedby is null");
+  }
 );
\ No newline at end of file