diff --git a/api-generator/build-apidoc.js b/api-generator/build-apidoc.js
index 31fb725dd..0f5cfee7b 100644
--- a/api-generator/build-apidoc.js
+++ b/api-generator/build-apidoc.js
@@ -227,7 +227,8 @@ if (project) {
                                 };
                             }),
                             returnType: signature.type.toString(),
-                            description: signature.comment && signature.comment.summary.map((s) => parseText(s.text || '')).join(' ')
+                            description: signature.comment && signature.comment.summary.map((s) => parseText(s.text || '')).join(' '),
+                            deprecated: signature.comment && signature.comment.getTag('@deprecated') ? parseText(signature.comment.getTag('@deprecated').content[0].text) : undefined
                         });
                     });
 
@@ -350,7 +351,8 @@ if (project) {
                                 readonly: prop.flags.isReadonly,
                                 type: prop.type.toString(),
                                 default: prop.comment && prop.comment.getTag('@defaultValue') ? prop.comment.getTag('@defaultValue').content[0].text : '', // TODO: Check
-                                description: prop.comment && prop.comment.summary.map((s) => s.text || '').join(' ')
+                                description: prop.comment && prop.comment.summary.map((s) => s.text || '').join(' '),
+                                deprecated: prop.comment && prop.comment.getTag('@deprecated') ? parseText(prop.comment.getTag('@deprecated').content[0].text) : undefined
                             });
                         });
 
@@ -395,7 +397,8 @@ if (project) {
                                     };
                                 }),
                                 returnType: signature.type.toString(),
-                                description: signature.comment && signature.comment.summary.map((s) => parseText(s.text || '')).join(' ')
+                                description: signature.comment && signature.comment.summary.map((s) => parseText(s.text || '')).join(' '),
+                                deprecated: signature.comment && signature.comment.getTag('@deprecated') ? parseText(signature.comment.getTag('@deprecated').content[0].text) : undefined
                             });
                         });
                 }
diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue
index 13626c856..f07f0f2ac 100755
--- a/components/lib/calendar/Calendar.vue
+++ b/components/lib/calendar/Calendar.vue
@@ -637,7 +637,7 @@ export default {
     updated() {
         if (this.overlay) {
             this.preventFocus = true;
-            this.updateFocus();
+            setTimeout(this.updateFocus, 0);
         }
 
         if (this.input && this.selectionStart != null && this.selectionEnd != null) {
diff --git a/layouts/doc/DocApiSection.vue b/layouts/doc/DocApiSection.vue
index 52ffbde50..c43698368 100644
--- a/layouts/doc/DocApiSection.vue
+++ b/layouts/doc/DocApiSection.vue
@@ -180,7 +180,8 @@ export default {
                         type: emit.parameters[0]?.type
                     },
                     returnType: emit.returnType,
-                    description: emit.description
+                    description: emit.description,
+                    deprecated: emit.deprecated
                 });
             }
 
@@ -194,7 +195,8 @@ export default {
                     name: prop.name,
                     type: prop.type,
                     default: prop.default,
-                    description: prop.description
+                    description: prop.description,
+                    deprecated: prop.deprecated
                 });
             }
 
diff --git a/layouts/doc/DocApiTable.vue b/layouts/doc/DocApiTable.vue
index 43d4c8c8f..5d7875f2c 100644
--- a/layouts/doc/DocApiTable.vue
+++ b/layouts/doc/DocApiTable.vue
@@ -21,7 +21,7 @@
                 <tr v-for="prop in data" :key="prop">
                     <td v-for="[k, v] in Object.entries(prop)" :key="k" :class="{ 'doc-option-type': k === 'type', 'doc-option-default': k === 'defaultValue' }">
                         <template v-if="k !== 'readonly' && k !== 'optional' && k !== 'deprecated'">
-                            <span v-if="k === 'name'" :id="id + '.' + v" class="doc-option-name">
+                            <span v-if="k === 'name'" :id="id + '.' + v" class="doc-option-name" :class="{ 'line-through cursor-pointer': !!prop.deprecated }" :title="prop.deprecated">
                                 {{ v
                                 }}<NuxtLink :to="`/${$router.currentRoute.value.name}/#${id}.${v}`" class="doc-option-link">
                                     <i class="pi pi-link"></i>