diff --git a/src/knockout/components/dropdown-select/dropdown-select.html b/src/knockout/components/dropdown-select/dropdown-select.html
index cbcadb3911..869f57bf9d 100644
--- a/src/knockout/components/dropdown-select/dropdown-select.html
+++ b/src/knockout/components/dropdown-select/dropdown-select.html
@@ -6,7 +6,7 @@
optionsText: 'koText',
optionsCaption: question.allowClear ? question.locPlaceholder.koRenderedHtml : undefined,
optionsAfterRender: question.koDisableOption,
- attr: {id: question.inputId, autocomplete: question.autocomplete, required: question.isRequired, 'aria-required': question.ariaRequired, 'aria-label': question.ariaLabel, 'aria-invalid': question.ariaInvalid, 'aria-describedby': question.ariaDescribedBy},
+ attr: {id: question.inputId, autocomplete: question.autocomplete, required: question.isRequired, 'aria-required': question.ariaRequired, 'aria-label': question.ariaLabel, 'aria-invalid': question.ariaInvalid, 'aria-errormessage': question.ariaErrormessage},
click: click,
event: { keyup: keyup },
disable: question.isInputReadOnly,
diff --git a/src/knockout/components/dropdown/dropdown.html b/src/knockout/components/dropdown/dropdown.html
index 5890a87c13..387380e1e6 100644
--- a/src/knockout/components/dropdown/dropdown.html
+++ b/src/knockout/components/dropdown/dropdown.html
@@ -11,7 +11,7 @@
'aria-required': question.ariaRequired,
'aria-label': question.ariaLabel,
'aria-invalid': question.ariaInvalid,
- 'aria-describedby': question.ariaDescribedBy,
+ 'aria-errormessage': question.ariaErrormessage,
'aria-expanded': question.ariaExpanded,
'aria-controls': model.listElementId,
'aria-activedescendant': model.ariaActivedescendant,
@@ -45,6 +45,7 @@
'aria-activedescendant': model.ariaActivedescendant,
'aria-label': question.a11y_input_ariaLabel,
'aria-labelledby': question.a11y_input_ariaLabelledBy,
+ 'aria-describedby': question.a11y_input_ariaDescribedBy,
placeholder: model.placeholderRendered,
readonly: model.filterReadOnly || undefined,
role: model.filterStringEnabled ? question.ariaRole : undefined,
diff --git a/src/knockout/components/rating/rating-item-smiley.html b/src/knockout/components/rating/rating-item-smiley.html
index ceb3f012f0..79fbb8d9c8 100644
--- a/src/knockout/components/rating/rating-item-smiley.html
+++ b/src/knockout/components/rating/rating-item-smiley.html
@@ -2,7 +2,7 @@
\ No newline at end of file
diff --git a/src/knockout/components/rating/rating-item-star.html b/src/knockout/components/rating/rating-item-star.html
index c659bda1cb..e2f6fc626e 100644
--- a/src/knockout/components/rating/rating-item-star.html
+++ b/src/knockout/components/rating/rating-item-star.html
@@ -2,7 +2,7 @@
diff --git a/src/knockout/components/rating/rating-item.html b/src/knockout/components/rating/rating-item.html
index 6300579721..b282a7de3b 100644
--- a/src/knockout/components/rating/rating-item.html
+++ b/src/knockout/components/rating/rating-item.html
@@ -2,7 +2,7 @@
diff --git a/src/knockout/components/tagbox/tagbox.html b/src/knockout/components/tagbox/tagbox.html
index 89da45401b..3f64f66f77 100644
--- a/src/knockout/components/tagbox/tagbox.html
+++ b/src/knockout/components/tagbox/tagbox.html
@@ -11,7 +11,7 @@
'aria-required': question.ariaRequired,
'aria-label': question.ariaLabel,
'aria-invalid': question.ariaInvalid,
- 'aria-describedby': question.ariaDescribedBy,
+ 'aria-errormessage': question.ariaErrormessage,
'aria-expanded': question.ariaExpanded,
'aria-controls': model.listElementId,
'aria-activedescendant': model.ariaActivedescendant,
@@ -46,6 +46,7 @@
'aria-activedescendant': model.ariaActivedescendant,
'aria-label': question.a11y_input_ariaLabel,
'aria-labelledby': question.a11y_input_ariaLabelledBy,
+ 'aria-describedby': question.a11y_input_ariaDescribedBy,
placeholder: model.filterStringPlaceholder,
disabled: question.isInputReadOnly,
readonly: model.filterReadOnly
diff --git a/src/knockout/templates/question-boolean.html b/src/knockout/templates/question-boolean.html
index e615fc0f32..7bdef06559 100644
--- a/src/knockout/templates/question-boolean.html
+++ b/src/knockout/templates/question-boolean.html
@@ -3,7 +3,7 @@
diff --git a/src/knockout/templates/question-checkbox.html b/src/knockout/templates/question-checkbox.html
index 9151404119..9067cae4a8 100644
--- a/src/knockout/templates/question-checkbox.html
+++ b/src/knockout/templates/question-checkbox.html
@@ -1,5 +1,5 @@