diff --git a/Gemfile.lock b/Gemfile.lock
index 8d6132849..4fdcf804a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,7 +170,7 @@ GEM
     base64 (0.3.0)
     bcrypt (3.1.22)
     benchmark (0.4.1)
-    bigdecimal (3.3.1)
+    bigdecimal (4.1.2)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
@@ -274,8 +274,8 @@ GEM
       dry-logic (~> 1.5)
       dry-types (~> 1.8)
       zeitwerk (~> 2.6)
-    dry-types (1.8.3)
-      bigdecimal (~> 3.0)
+    dry-types (1.9.1)
+      bigdecimal (>= 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
@@ -598,14 +598,14 @@ GEM
     newrelic_rpm (9.6.0)
       base64
     nio4r (2.7.5)
-    nokogiri (1.19.3)
+    nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.3-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-darwin)
+    nokogiri (1.19.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (1.1.6)
       auth-sanitizer (~> 0.2, >= 0.2.1)
@@ -627,7 +627,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0, >= 2.0.5)
       version_gem (~> 1.1, >= 1.1.11)
-    oj (3.16.10)
+    oj (3.17.3)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (2.1.4)
@@ -674,7 +674,7 @@ GEM
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
diff --git a/VERSION_CW b/VERSION_CW
index 0fb7a35b6..fb0557132 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-4.14.2
+4.15.1
diff --git a/app/builders/messages/messenger/message_builder.rb b/app/builders/messages/messenger/message_builder.rb
index ecd6f06ea..712a24608 100644
--- a/app/builders/messages/messenger/message_builder.rb
+++ b/app/builders/messages/messenger/message_builder.rb
@@ -6,6 +6,11 @@ class Messages::Messenger::MessageBuilder
     return if unsupported_file_type?(attachment['type'])
 
     params = attachment_params(attachment)
+    # During Meta's sticker webhook transition, a sticker message carries both an `image`
+    # and a `sticker` attachment pointing to the same URL. Skip the redundant sticker so it
+    # isn't attached twice, while still storing legitimate duplicate attachments of other types.
+    return if duplicate_sticker?(attachment, params[:external_url])
+
     attachment_obj = @message.attachments.new(params.except(:remote_file_url))
     attachment_obj.save!
     if facebook_reel?(attachment)
@@ -13,10 +18,14 @@ class Messages::Messenger::MessageBuilder
     elsif params[:remote_file_url]
       attach_file(attachment_obj, params[:remote_file_url])
     end
+    fetch_attachment_links(attachment_obj)
+    update_attachment_file_type(attachment_obj)
+  end
+
+  def fetch_attachment_links(attachment_obj)
     fetch_story_link(attachment_obj) if attachment_obj.file_type == 'story_mention'
     fetch_ig_story_link(attachment_obj) if attachment_obj.file_type == 'ig_story'
     fetch_ig_post_link(attachment_obj) if attachment_obj.file_type == 'ig_post'
-    update_attachment_file_type(attachment_obj)
   end
 
   def attach_file(attachment, file_url)
@@ -111,13 +120,20 @@ class Messages::Messenger::MessageBuilder
 
   # Facebook may send attachment types that don't directly match our file_type enum.
   # Map known aliases to their canonical enum values.
-  FACEBOOK_FILE_TYPE_MAP = { reel: :ig_reel }.freeze
+  FACEBOOK_FILE_TYPE_MAP = { reel: :ig_reel, sticker: :image }.freeze
 
   def normalize_file_type(type)
     sym = type.to_sym
     FACEBOOK_FILE_TYPE_MAP.fetch(sym, sym)
   end
 
+  def duplicate_sticker?(attachment, url)
+    return false unless attachment['type'].to_sym == :sticker
+    return false if url.blank?
+
+    @message.attachments.any? { |existing| existing.external_url == url }
+  end
+
   # Facebook sends reel URLs as webpage links (facebook.com/reel/...) rather than
   # direct video URLs. Downloading these yields HTML, not video content.
   def facebook_reel?(attachment)
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index eafda0fe2..bc1082583 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -214,3 +214,5 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     render json: error, status: error_status
   end
 end
+
+Api::V1::Accounts::ContactsController.prepend_mod_with('Api::V1::Accounts::ContactsController')
diff --git a/app/javascript/dashboard/api/captain/messageReports.js b/app/javascript/dashboard/api/captain/messageReports.js
new file mode 100644
index 000000000..2df1e5747
--- /dev/null
+++ b/app/javascript/dashboard/api/captain/messageReports.js
@@ -0,0 +1,9 @@
+import ApiClient from '../ApiClient';
+
+class MessageReports extends ApiClient {
+  constructor() {
+    super('captain/message_reports', { accountScoped: true });
+  }
+}
+
+export default new MessageReports();
diff --git a/app/javascript/dashboard/api/helpCenter/articles.js b/app/javascript/dashboard/api/helpCenter/articles.js
index bab45bcb5..55b620d1a 100644
--- a/app/javascript/dashboard/api/helpCenter/articles.js
+++ b/app/javascript/dashboard/api/helpCenter/articles.js
@@ -16,6 +16,7 @@ class ArticlesAPI extends PortalsAPI {
     authorId,
     categorySlug,
     sort,
+    query,
   }) {
     const url = getArticleSearchURL({
       pageNumber,
@@ -25,6 +26,7 @@ class ArticlesAPI extends PortalsAPI {
       authorId,
       categorySlug,
       sort,
+      query,
       host: this.url,
     });
 
diff --git a/app/javascript/dashboard/assets/scss/_next-colors.scss b/app/javascript/dashboard/assets/scss/_next-colors.scss
index 784edce6c..4a67e5182 100644
--- a/app/javascript/dashboard/assets/scss/_next-colors.scss
+++ b/app/javascript/dashboard/assets/scss/_next-colors.scss
@@ -145,6 +145,12 @@
     --black-alpha-2: 0, 0, 0, 0.04;
     --border-blue: 39, 129, 246, 0.5;
     --white-alpha: 255, 255, 255, 0.8;
+
+    // Voice call widget - light mode
+    --call-widget: 33, 34, 38, 0.95;
+    --call-widget-border: 255, 255, 255, 0.1;
+    --call-widget-text: 237, 238, 240, 1;
+    --call-widget-sub-text: 173, 177, 184, 1;
   }
 
   .dark {
@@ -291,6 +297,12 @@
     --border-blue: 39, 129, 246, 0.5;
     --border-container: 255, 255, 255, 0;
     --white-alpha: 255, 255, 255, 0.1;
+
+    // Voice call widget - dark mode
+    --call-widget: 50, 53, 61, 1;
+    --call-widget-border: 255, 255, 255, 0.07;
+    --call-widget-text: 237, 238, 240, 1;
+    --call-widget-sub-text: 173, 177, 184, 1;
   }
 }
 // NEXT COLORS END
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
index b3847030b..4b9d0b466 100644
--- a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
@@ -26,6 +26,13 @@ const resetForm = () => {
   form.description = '';
 };
 
+const open = (company = {}) => {
+  form.name = company.name || '';
+  form.domain = company.domain || '';
+  form.description = company.description || '';
+  dialogRef.value?.open();
+};
+
 const handleConfirm = () => {
   if (isFormInvalid.value) return;
 
@@ -45,7 +52,7 @@ const onSuccess = () => {
   closeDialog();
 };
 
-defineExpose({ dialogRef, onSuccess });
+defineExpose({ dialogRef, onSuccess, open });
 </script>
 
 <template>
diff --git a/app/javascript/dashboard/components-next/Companies/CompanySelector.vue b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
new file mode 100644
index 000000000..f8cfc8058
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
@@ -0,0 +1,153 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useDebounceFn } from '@vueuse/core';
+import CompanyAPI from 'dashboard/api/companies';
+import { useAlert } from 'dashboard/composables';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import CompanyCreateDialog from 'dashboard/components-next/Companies/CompanyCreateDialog.vue';
+
+const props = defineProps({
+  modelValue: {
+    type: [String, Number],
+    default: '',
+  },
+  // Name of the linked company, so the label shows before the list is loaded.
+  selectedName: {
+    type: String,
+    default: '',
+  },
+  isDetailsView: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['select']);
+
+const { t } = useI18n();
+
+const CREATE_PREFIX = 'create:';
+
+const options = ref([]);
+const searchQuery = ref('');
+const createDialogRef = ref(null);
+const isCreatingCompany = ref(false);
+
+const toOption = company => ({ label: company.name, value: company.id });
+
+const createOption = computed(() => {
+  const name = searchQuery.value.trim();
+  if (!name) return null;
+
+  const exists = options.value.some(
+    option => option.label.toLowerCase() === name.toLowerCase()
+  );
+  if (exists) return null;
+
+  return {
+    label: t('COMPANIES.SELECTOR.CREATE_OPTION', { name }),
+    value: `${CREATE_PREFIX}${name}`,
+  };
+});
+
+const comboboxOptions = computed(() => {
+  const list = [...options.value];
+
+  // Keep the linked company visible even when it is not in the loaded results.
+  if (
+    props.modelValue &&
+    props.selectedName &&
+    !list.some(option => option.value === Number(props.modelValue))
+  ) {
+    list.unshift({
+      label: props.selectedName,
+      value: Number(props.modelValue),
+    });
+  }
+
+  if (createOption.value) list.push(createOption.value);
+  return list;
+});
+
+const fetchCompanies = async query => {
+  try {
+    const {
+      data: { payload },
+    } = query
+      ? await CompanyAPI.search(query)
+      : await CompanyAPI.get({ page: 1 });
+    options.value = (payload || []).map(toOption);
+  } catch {
+    options.value = [];
+  }
+};
+
+// Fetch lazily, only when the dropdown opens, instead of on mount.
+const handleOpen = () => {
+  searchQuery.value = '';
+  fetchCompanies('');
+};
+
+const handleSearch = useDebounceFn(query => {
+  searchQuery.value = query?.trim() || '';
+  fetchCompanies(searchQuery.value);
+}, 300);
+
+// Open the create dialog (prefilled with the typed name) so the user can add
+// domain/description before saving, instead of creating with just a name.
+const createCompany = async company => {
+  isCreatingCompany.value = true;
+  try {
+    const {
+      data: { payload },
+    } = await CompanyAPI.create({ company });
+    createDialogRef.value?.onSuccess();
+    emit('select', { id: payload.id, name: payload.name });
+    useAlert(t('COMPANIES.CREATE.MESSAGES.SUCCESS'));
+  } catch {
+    useAlert(t('COMPANIES.CREATE.MESSAGES.ERROR'));
+  } finally {
+    isCreatingCompany.value = false;
+  }
+};
+
+const handleSelect = value => {
+  if (typeof value === 'string' && value.startsWith(CREATE_PREFIX)) {
+    createDialogRef.value?.open({ name: value.slice(CREATE_PREFIX.length) });
+    // Drop the transient "Add …" option so the button label doesn't stick to
+    // it if the dialog is dismissed without creating.
+    searchQuery.value = '';
+    return;
+  }
+
+  const id = value ? Number(value) : '';
+  const selected = comboboxOptions.value.find(option => option.value === id);
+  emit('select', { id, name: selected?.label || '' });
+};
+</script>
+
+<template>
+  <ComboBox
+    :model-value="modelValue"
+    :options="comboboxOptions"
+    :display-label="selectedName"
+    :placeholder="t('COMPANIES.SELECTOR.PLACEHOLDER')"
+    :search-placeholder="t('COMPANIES.SEARCH_PLACEHOLDER')"
+    use-api-results
+    class="[&>div>button]:h-8 [&>div>div_ul]:max-h-56"
+    :class="{
+      '[&>div>button]:bg-n-alpha-black2 [&>div>button:not(.focused)]:!outline-transparent':
+        !isDetailsView,
+      '[&>div>button]:!bg-n-alpha-black2': isDetailsView,
+    }"
+    @open="handleOpen"
+    @search="handleSearch"
+    @update:model-value="handleSelect"
+  />
+  <CompanyCreateDialog
+    ref="createDialogRef"
+    :is-loading="isCreatingCompany"
+    @create="createCompany"
+  />
+</template>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index 50af6f0c0..8dd9d63e2 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -15,6 +15,7 @@ const props = defineProps({
   id: { type: Number, required: true },
   name: { type: String, default: '' },
   email: { type: String, default: '' },
+  companyId: { type: [Number, String], default: '' },
   additionalAttributes: { type: Object, default: () => ({}) },
   phoneNumber: { type: String, default: '' },
   thumbnail: { type: String, default: '' },
@@ -41,6 +42,7 @@ const getInitialContactData = () => ({
   id: props.id,
   name: props.name,
   email: props.email,
+  companyId: props.companyId,
   phoneNumber: props.phoneNumber,
   additionalAttributes: props.additionalAttributes,
 });
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
index 66296257f..62978875e 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
@@ -5,8 +5,11 @@ import { required, email } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
 import { splitName } from '@chatwoot/utils';
 import countries from 'shared/constants/countries.js';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { useAccount } from 'dashboard/composables/useAccount';
 import Input from 'dashboard/components-next/input/Input.vue';
 import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import CompanySelector from 'dashboard/components-next/Companies/CompanySelector.vue';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import PhoneNumberInput from 'dashboard/components-next/phonenumberinput/PhoneNumberInput.vue';
 
@@ -28,6 +31,7 @@ const props = defineProps({
 const emit = defineEmits(['update']);
 
 const { t } = useI18n();
+const { currentAccount, isCloudFeatureEnabled } = useAccount();
 
 const FORM_CONFIG = {
   FIRST_NAME: { field: 'firstName' },
@@ -54,6 +58,7 @@ const defaultState = {
   id: 0,
   name: '',
   email: '',
+  companyId: '',
   firstName: '',
   lastName: '',
   phoneNumber: '',
@@ -85,6 +90,23 @@ const validationRules = {
 const v$ = useVuelidate(validationRules, state);
 
 const isFormInvalid = computed(() => v$.value.$invalid);
+const hasCompaniesFeature = computed(
+  () =>
+    currentAccount.value?.id && isCloudFeatureEnabled(FEATURE_FLAGS.COMPANIES)
+);
+const showCompanySelector = computed(
+  () =>
+    hasCompaniesFeature.value &&
+    (Boolean(state.companyId) || !state.additionalAttributes.companyName)
+);
+
+const emitContactUpdate = async () => {
+  const isFormValid = await v$.value.$validate();
+  if (!isFormValid) return;
+
+  const { firstName, lastName, ...stateWithoutNames } = state;
+  emit('update', stateWithoutNames);
+};
 
 const prepareStateBasedOnProps = () => {
   if (props.isNewContact) {
@@ -96,6 +118,7 @@ const prepareStateBasedOnProps = () => {
     name = '',
     email: emailAddress,
     phoneNumber,
+    companyId = '',
     additionalAttributes = {},
   } = props.contactData || {};
   const { firstName, lastName } = splitName(name || '');
@@ -115,6 +138,7 @@ const prepareStateBasedOnProps = () => {
   Object.assign(state, {
     id,
     name,
+    companyId: companyId || '',
     firstName,
     lastName,
     email: emailAddress,
@@ -200,11 +224,7 @@ const getFormBinding = key => {
         }
       }
 
-      const isFormValid = await v$.value.$validate();
-      if (isFormValid) {
-        const { firstName, lastName, ...stateWithoutNames } = state;
-        emit('update', stateWithoutNames);
-      }
+      await emitContactUpdate();
     },
   });
 };
@@ -221,6 +241,12 @@ const handleCountrySelection = value => {
   emit('update', state);
 };
 
+const handleCompanySelection = async ({ id, name }) => {
+  state.companyId = id || '';
+  state.additionalAttributes.companyName = name || '';
+  await emitContactUpdate();
+};
+
 const resetValidation = () => {
   v$.value.$reset();
 };
@@ -273,6 +299,13 @@ defineExpose({
             :placeholder="item.placeholder"
             :show-border="isDetailsView"
           />
+          <CompanySelector
+            v-else-if="item.key === 'COMPANY_NAME' && showCompanySelector"
+            :model-value="state.companyId"
+            :selected-name="state.additionalAttributes.companyName"
+            :is-details-view="isDetailsView"
+            @select="handleCompanySelection"
+          />
           <Input
             v-else
             v-model="getFormBinding(item.key).value"
diff --git a/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue b/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
index 72bc2c7dd..87fe1d214 100644
--- a/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
+++ b/app/javascript/dashboard/components-next/Contacts/Pages/ContactsList.vue
@@ -92,6 +92,7 @@ const handleAvatarHover = (id, isHovered) => {
         :id="contact.id"
         :name="contact.name"
         :email="contact.email"
+        :company-id="contact.companyId"
         :thumbnail="contact.thumbnail"
         :phone-number="contact.phoneNumber"
         :additional-attributes="contact.additionalAttributes"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
index 9b1c48a90..564888f0d 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
@@ -210,9 +210,9 @@ const handleClick = id => {
         </div>
       </div>
     </div>
-    <div class="flex items-center justify-between w-full gap-4">
-      <div class="flex items-center gap-4">
-        <div class="flex items-center gap-1">
+    <div class="flex items-center justify-between w-full gap-2 sm:gap-4">
+      <div class="flex items-center min-w-0 gap-2 sm:gap-4">
+        <div class="flex items-center min-w-0 gap-1">
           <Avatar
             :name="authorName"
             :src="authorThumbnailSrc"
@@ -223,19 +223,17 @@ const handleClick = id => {
             {{ authorName || '-' }}
           </span>
         </div>
-        <span
-          class="flex items-center gap-1 text-sm whitespace-nowrap text-n-slate-11"
-        >
+        <span class="flex items-center min-w-0 gap-1 text-sm text-n-slate-11">
           <EmojiIcon
             v-if="category?.icon"
             :value="category.icon"
             :color="category.icon_color"
             class="flex-shrink-0 size-4"
           />
-          {{ categoryName }}
+          <span class="truncate">{{ categoryName }}</span>
         </span>
         <div
-          class="inline-flex items-center gap-1 text-n-slate-11 whitespace-nowrap"
+          class="inline-flex items-center gap-1 text-n-slate-11 whitespace-nowrap shrink-0"
         >
           <Icon icon="i-lucide-eye" class="size-4" />
           <span class="text-sm">
@@ -247,7 +245,7 @@ const handleClick = id => {
           </span>
         </div>
       </div>
-      <span class="text-sm text-n-slate-11 line-clamp-1">
+      <span class="text-sm text-n-slate-11 line-clamp-1 shrink-0">
         {{ lastUpdatedAt }}
       </span>
     </div>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue b/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue
index 5b6399da7..fb564622a 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue
@@ -67,11 +67,11 @@ const togglePortalSwitcher = () => {
         >
           <span
             v-if="activePortalName"
-            class="text-xl font-medium text-n-slate-12"
+            class="min-w-0 text-xl font-medium truncate text-n-slate-12"
           >
             {{ activePortalName }}
           </span>
-          <div v-if="activePortalName" class="relative group">
+          <div v-if="activePortalName" class="relative shrink-0 group">
             <OnClickOutside @trigger="showPortalSwitcher = false">
               <Button
                 icon="i-lucide-chevron-down"
@@ -91,6 +91,9 @@ const togglePortalSwitcher = () => {
             </OnClickOutside>
             <CreatePortalDialog ref="createPortalDialogRef" />
           </div>
+          <div class="flex justify-end min-w-0 grow">
+            <slot name="title-actions" />
+          </div>
         </div>
         <slot name="header-actions" />
       </div>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue
index 575eaa828..75aeb86d1 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue
@@ -24,6 +24,10 @@ const props = defineProps({
     type: Set,
     default: () => new Set(),
   },
+  isSearching: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(['translateArticle', 'toggleSelect']);
@@ -41,6 +45,7 @@ const hoveredArticleId = ref(null);
 const dragEnabled = computed(() => {
   return (
     props.isCategoryArticles &&
+    !props.isSearching &&
     localArticles.value?.length > 1 &&
     props.selectedArticleIds.size === 0
   );
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
index 68c93c007..66bcf6831 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { OnClickOutside } from '@vueuse/components';
 import { useMapGetter } from 'dashboard/composables/store.js';
 import { useConfig } from 'dashboard/composables/useConfig';
+import { debounce } from '@chatwoot/utils';
 import { ARTICLE_TABS, CATEGORY_ALL } from 'dashboard/helper/portalHelper';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { useAlert } from 'dashboard/composables';
@@ -18,6 +19,7 @@ import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import ArticleEmptyState from 'dashboard/components-next/HelpCenter/EmptyState/Article/ArticleEmptyState.vue';
 import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
 import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import BulkTranslateDialog from './BulkTranslateDialog.vue';
@@ -49,7 +51,12 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits(['pageChange', 'fetchPortal', 'refreshArticles']);
+const emit = defineEmits([
+  'pageChange',
+  'fetchPortal',
+  'refreshArticles',
+  'search',
+]);
 
 const router = useRouter();
 const route = useRoute();
@@ -65,6 +72,9 @@ const isFeatureEnabledonAccount = useMapGetter(
 const selectedArticleIds = ref(new Set());
 const deleteConfirmDialogRef = ref(null);
 const isCategoryMenuOpen = ref(false);
+const searchQuery = ref(route.query.search || '');
+
+const debouncedSearch = debounce(() => emit('search', searchQuery.value), 500);
 
 const { isEnterprise } = useConfig();
 
@@ -122,6 +132,7 @@ const updateRoute = newParams => {
       categorySlug: newParams.categorySlug ?? categorySlug,
       ...newParams,
     },
+    query: route.query,
   });
 };
 
@@ -145,7 +156,12 @@ const showCategoryHeaderControls = computed(
   () => props.isCategoryArticles && !isSwitchingPortal.value
 );
 
+const isSearching = computed(() => Boolean(searchQuery.value?.trim()));
+
 const getEmptyStateText = type => {
+  if (isSearching.value) {
+    return t(`HELP_CENTER.ARTICLES_PAGE.EMPTY_STATE.SEARCH.${type}`);
+  }
   if (props.isCategoryArticles) {
     return t(`HELP_CENTER.ARTICLES_PAGE.EMPTY_STATE.CATEGORY.${type}`);
   }
@@ -291,6 +307,19 @@ watch(
     :show-pagination-footer="shouldShowPaginationFooter"
     @update:current-page="handlePageChange"
   >
+    <template #title-actions>
+      <Input
+        v-if="!isSwitchingPortal"
+        v-model="searchQuery"
+        :placeholder="
+          t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.SEARCH_PLACEHOLDER')
+        "
+        type="search"
+        size="sm"
+        class="w-full max-w-[16rem] min-w-0"
+        @input="debouncedSearch"
+      />
+    </template>
     <template #header-actions>
       <div class="flex items-end justify-between">
         <ArticleHeaderControls
@@ -422,6 +451,7 @@ watch(
         <ArticleList
           :articles="articles"
           :is-category-articles="isCategoryArticles"
+          :is-searching="isSearching"
           :selected-article-ids="selectedArticleIds"
           class="relative z-0"
           @translate-article="handleTranslateArticle"
@@ -433,7 +463,7 @@ watch(
         class="pt-14"
         :title="getEmptyStateTitle"
         :subtitle="getEmptyStateSubtitle"
-        :show-button="hasNoArticlesInPortal"
+        :show-button="hasNoArticlesInPortal && !isSearching"
         :button-label="
           t('HELP_CENTER.ARTICLES_PAGE.EMPTY_STATE.ALL.BUTTON_LABEL')
         "
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoriesPage.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoriesPage.vue
index 1f4e4b347..95a21a023 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoriesPage.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoriesPage.vue
@@ -37,10 +37,21 @@ const { t } = useI18n();
 
 const editCategoryDialog = ref(null);
 const selectedCategory = ref(null);
+const searchQuery = ref('');
 
 const isSwitchingPortal = useMapGetter('portals/isSwitchingPortal');
 const isLoading = computed(() => props.isFetching || isSwitchingPortal.value);
-const hasCategories = computed(() => props.categories?.length > 0);
+
+const filteredCategories = computed(() => {
+  const query = searchQuery.value.trim().toLowerCase();
+  if (!query) return props.categories;
+  return props.categories.filter(category =>
+    category.name?.toLowerCase().includes(query)
+  );
+});
+
+const hasCategories = computed(() => filteredCategories.value?.length > 0);
+const isSearching = computed(() => searchQuery.value.trim().length > 0);
 
 const updateRoute = (newParams, routeName) => {
   const { accountId, portalSlug, locale } = route.params;
@@ -115,6 +126,7 @@ const reorderCategories = async reorderedGroup => {
   <HelpCenterLayout :show-pagination-footer="false">
     <template #header-actions>
       <CategoryHeaderControls
+        v-model:search-query="searchQuery"
         :categories="categories"
         :is-category-articles="false"
         :allowed-locales="allowedLocales"
@@ -130,11 +142,18 @@ const reorderCategories = async reorderedGroup => {
       </div>
       <CategoryList
         v-else-if="hasCategories"
-        :categories="categories"
+        :categories="filteredCategories"
+        :disable-drag="isSearching"
         @click="openCategoryArticles"
         @action="handleAction"
         @reorder="reorderCategories"
       />
+      <CategoryEmptyState
+        v-else-if="isSearching"
+        class="pt-14"
+        :title="t('HELP_CENTER.CATEGORY_PAGE.SEARCH_EMPTY_STATE.TITLE')"
+        :subtitle="t('HELP_CENTER.CATEGORY_PAGE.SEARCH_EMPTY_STATE.SUBTITLE')"
+      />
       <CategoryEmptyState
         v-else
         class="pt-14"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
index d134f1168..e1f04cfb0 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
@@ -6,6 +6,7 @@ import { OnClickOutside } from '@vueuse/components';
 import { useStoreGetters } from 'dashboard/composables/store.js';
 
 import Button from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
 import Breadcrumb from 'dashboard/components-next/breadcrumb/Breadcrumb.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import CategoryDialog from 'dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue';
@@ -27,6 +28,11 @@ const props = defineProps({
 
 const emit = defineEmits(['localeChange', 'newArticle']);
 
+const searchQuery = defineModel('searchQuery', {
+  type: String,
+  default: '',
+});
+
 const route = useRoute();
 const router = useRouter();
 const getters = useStoreGetters();
@@ -162,23 +168,34 @@ const handleBreadcrumbClick = () => {
       :items="breadcrumbItems"
       @click="handleBreadcrumbClick"
     />
-    <div v-if="!hasSelectedCategory" class="relative">
-      <OnClickOutside @trigger="isCreateCategoryDialogOpen = false">
-        <Button
-          :label="t('HELP_CENTER.CATEGORY_PAGE.CATEGORY_HEADER.NEW_CATEGORY')"
-          icon="i-lucide-plus"
-          size="sm"
-          @click="isCreateCategoryDialogOpen = !isCreateCategoryDialogOpen"
-        />
-        <CategoryDialog
-          v-if="isCreateCategoryDialogOpen"
-          mode="create"
-          :portal-name="currentPortalName"
-          :active-locale-name="activeLocaleName"
-          :active-locale-code="activeLocaleCode"
-          @close="isCreateCategoryDialogOpen = false"
-        />
-      </OnClickOutside>
+    <div v-if="!hasSelectedCategory" class="flex items-center gap-2">
+      <Input
+        v-model="searchQuery"
+        :placeholder="
+          t('HELP_CENTER.CATEGORY_PAGE.CATEGORY_HEADER.SEARCH_PLACEHOLDER')
+        "
+        type="search"
+        size="sm"
+        class="w-48"
+      />
+      <div class="relative">
+        <OnClickOutside @trigger="isCreateCategoryDialogOpen = false">
+          <Button
+            :label="t('HELP_CENTER.CATEGORY_PAGE.CATEGORY_HEADER.NEW_CATEGORY')"
+            icon="i-lucide-plus"
+            size="sm"
+            @click="isCreateCategoryDialogOpen = !isCreateCategoryDialogOpen"
+          />
+          <CategoryDialog
+            v-if="isCreateCategoryDialogOpen"
+            mode="create"
+            :portal-name="currentPortalName"
+            :active-locale-name="activeLocaleName"
+            :active-locale-code="activeLocaleCode"
+            @close="isCreateCategoryDialogOpen = false"
+          />
+        </OnClickOutside>
+      </div>
     </div>
     <div v-else class="relative flex items-center gap-2">
       <OnClickOutside @trigger="isEditCategoryDialogOpen = false">
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
index 45e783246..a306c54e5 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
@@ -8,6 +8,10 @@ const props = defineProps({
     type: Array,
     required: true,
   },
+  disableDrag: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(['click', 'action', 'reorder']);
@@ -15,7 +19,7 @@ const emit = defineEmits(['click', 'action', 'reorder']);
 const localCategories = ref(props.categories);
 
 const dragEnabled = computed(() => {
-  return localCategories.value?.length > 1;
+  return !props.disableDrag && localCategories.value?.length > 1;
 });
 
 const handleClick = slug => {
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocalesPage.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocalesPage.vue
index 22dd42edd..fc3b428aa 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocalesPage.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/LocalePage/LocalesPage.vue
@@ -2,8 +2,12 @@
 import { computed, ref } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store.js';
 
+import { useI18n } from 'vue-i18n';
+
 import HelpCenterLayout from 'dashboard/components-next/HelpCenter/HelpCenterLayout.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import LocaleList from 'dashboard/components-next/HelpCenter/Pages/LocalePage/LocaleList.vue';
 import AddLocaleDialog from 'dashboard/components-next/HelpCenter/Pages/LocalePage/AddLocaleDialog.vue';
@@ -19,7 +23,10 @@ const props = defineProps({
   },
 });
 
+const { t } = useI18n();
+
 const addLocaleDialogRef = ref(null);
+const searchQuery = ref('');
 
 const isSwitchingPortal = useMapGetter('portals/isSwitchingPortal');
 
@@ -28,6 +35,19 @@ const openAddLocaleDialog = () => {
 };
 
 const localeCount = computed(() => props.locales?.length);
+
+const filteredLocales = computed(() => {
+  const query = searchQuery.value.trim().toLowerCase();
+  if (!query) return props.locales;
+  return props.locales.filter(
+    locale =>
+      locale.name?.toLowerCase().includes(query) ||
+      locale.code?.toLowerCase().includes(query)
+  );
+});
+
+const isSearching = computed(() => searchQuery.value.trim().length > 0);
+const hasResults = computed(() => filteredLocales.value?.length > 0);
 </script>
 
 <template>
@@ -39,12 +59,21 @@ const localeCount = computed(() => props.locales?.length);
             {{ $t('HELP_CENTER.LOCALES_PAGE.LOCALES_COUNT', localeCount) }}
           </span>
         </div>
-        <Button
-          :label="$t('HELP_CENTER.LOCALES_PAGE.NEW_LOCALE_BUTTON_TEXT')"
-          icon="i-lucide-plus"
-          size="sm"
-          @click="openAddLocaleDialog"
-        />
+        <div class="flex items-center gap-2">
+          <Input
+            v-model="searchQuery"
+            :placeholder="$t('HELP_CENTER.LOCALES_PAGE.SEARCH_PLACEHOLDER')"
+            type="search"
+            size="sm"
+            class="w-48"
+          />
+          <Button
+            :label="$t('HELP_CENTER.LOCALES_PAGE.NEW_LOCALE_BUTTON_TEXT')"
+            icon="i-lucide-plus"
+            size="sm"
+            @click="openAddLocaleDialog"
+          />
+        </div>
       </div>
     </template>
     <template #content>
@@ -54,7 +83,13 @@ const localeCount = computed(() => props.locales?.length);
       >
         <Spinner />
       </div>
-      <LocaleList v-else :locales="locales" :portal="portal" />
+      <EmptyStateLayout
+        v-else-if="isSearching && !hasResults"
+        :title="t('HELP_CENTER.LOCALES_PAGE.SEARCH_EMPTY_STATE.TITLE')"
+        :subtitle="t('HELP_CENTER.LOCALES_PAGE.SEARCH_EMPTY_STATE.SUBTITLE')"
+        :show-backdrop="false"
+      />
+      <LocaleList v-else :locales="filteredLocales" :portal="portal" />
     </template>
     <AddLocaleDialog ref="addLocaleDialogRef" :portal="portal" />
   </HelpCenterLayout>
diff --git a/app/javascript/dashboard/components-next/call/CallCard.vue b/app/javascript/dashboard/components-next/call/CallCard.vue
index 55da3dacf..d041150c2 100644
--- a/app/javascript/dashboard/components-next/call/CallCard.vue
+++ b/app/javascript/dashboard/components-next/call/CallCard.vue
@@ -75,11 +75,11 @@ const channelIcon = computed(() => {
 
 <template>
   <div
-    class="flex flex-col gap-2 pt-4 bg-n-solid-2/95 rounded-2xl shadow-xl outline outline-1 outline-n-strong backdrop-blur-md"
+    class="flex flex-col gap-1 pt-4 bg-n-call-widget rounded-2xl shadow-xl outline outline-1 outline-n-call-widget-border backdrop-blur-md"
     :class="call?.conversationId ? 'pb-2' : 'pb-4'"
   >
     <!-- Top section: status badge + location/inbox + duration -->
-    <div class="flex flex-col gap-3">
+    <div class="flex flex-col gap-3 pb-3 border-b border-n-call-widget-border">
       <div class="flex items-center gap-2 px-4">
         <!-- Ongoing: status badge on left -->
         <div v-if="isOngoing" class="flex items-center gap-1.5 shrink-0">
@@ -100,10 +100,10 @@ const channelIcon = computed(() => {
           <Icon
             v-else-if="!isOngoing"
             :icon="channelIcon"
-            class="size-3.5 text-n-slate-10 shrink-0"
+            class="size-3.5 text-n-call-widget-sub-text shrink-0"
           />
           <span
-            class="text-xs font-medium text-n-slate-11 tracking-tight truncate"
+            class="text-xs font-medium text-n-call-widget-sub-text tracking-tight truncate"
           >
             {{ callInfo.location }}
           </span>
@@ -112,7 +112,7 @@ const channelIcon = computed(() => {
         <!-- Ongoing: duration on right -->
         <p
           v-if="isOngoing"
-          class="font-display text-base font-medium text-n-slate-11 shrink-0 mb-0 tabular-nums tracking-tight"
+          class="font-display text-base font-medium text-n-call-widget-sub-text shrink-0 mb-0 tabular-nums tracking-tight"
         >
           {{ duration }}
         </p>
@@ -132,7 +132,7 @@ const channelIcon = computed(() => {
             slate
             ghost
             xs
-            class="!rounded-full -my-1"
+            class="!rounded-full -my-1 -me-1 !text-n-call-widget-sub-text"
             @click="$emit('dismiss')"
           />
         </div>
@@ -149,13 +149,13 @@ const channelIcon = computed(() => {
         </div>
         <div class="flex-1 min-w-0">
           <p
-            class="font-display text-sm font-medium text-n-slate-12 truncate mb-0.5 tracking-tight leading-tight"
+            class="font-display text-sm font-medium text-n-call-widget-text truncate mb-0.5 tracking-tight leading-tight"
           >
             {{ callInfo.contactName }}
           </p>
           <p
             v-if="callInfo.phoneNumber"
-            class="text-sm text-n-slate-11 truncate mb-0 tracking-tight leading-tight"
+            class="text-sm text-n-call-widget-sub-text truncate mb-0 tracking-tight leading-tight"
           >
             {{ callInfo.phoneNumber }}
           </p>
@@ -217,23 +217,23 @@ const channelIcon = computed(() => {
     >
       <template #icon>
         <span
-          class="flex items-center gap-1 text-n-slate-11 group-hover:text-n-slate-12"
+          class="flex items-center gap-1 text-n-call-widget-sub-text group-hover:text-n-call-widget-text"
         >
           <Icon
             icon="i-ph-chat-circle-text-bold"
-            class="size-3.5 text-n-slate-11 shrink-0"
+            class="size-3.5 text-n-call-widget-sub-text shrink-0"
           />
           <span class="text-sm tracking-tight tabular-nums">
             #{{ call.conversationId }}
           </span>
           <Icon
             icon="i-ph-caret-right-bold"
-            class="size-3 text-n-slate-11 shrink-0"
+            class="size-3 text-n-call-widget-sub-text shrink-0"
           />
         </span>
       </template>
       <span
-        class="text-sm text-n-slate-11 tracking-tight group-hover:text-n-slate-12"
+        class="text-sm text-n-call-widget-sub-text tracking-tight group-hover:text-n-call-widget-text"
       >
         {{ $t('CONVERSATION.VOICE_WIDGET.GO_TO_CONVERSATION') }}
       </span>
diff --git a/app/javascript/dashboard/components-next/combobox/ComboBox.vue b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
index 58d9e634d..a39a6f6a1 100644
--- a/app/javascript/dashboard/components-next/combobox/ComboBox.vue
+++ b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
@@ -14,6 +14,9 @@ const props = defineProps({
       value.every(option => 'value' in option && 'label' in option),
   },
   placeholder: { type: String, default: '' },
+  // Fallback label shown when the selected value is not in `options` yet
+  // (e.g. API-backed lists that load lazily on open).
+  displayLabel: { type: String, default: '' },
   modelValue: { type: [String, Number], default: '' },
   disabled: { type: Boolean, default: false },
   searchPlaceholder: { type: String, default: '' },
@@ -23,7 +26,7 @@ const props = defineProps({
   useApiResults: { type: Boolean, default: false }, // useApiResults prop to determine if search is handled by API
 });
 
-const emit = defineEmits(['update:modelValue', 'search']);
+const emit = defineEmits(['update:modelValue', 'search', 'open']);
 
 const { t } = useI18n();
 
@@ -52,7 +55,7 @@ const selectedLabel = computed(() => {
   const selected = props.options.find(
     option => option.value === selectedValue.value
   );
-  return selected?.label ?? selectPlaceholder.value;
+  return selected?.label ?? (props.displayLabel || selectPlaceholder.value);
 });
 
 const selectOption = option => {
@@ -72,6 +75,7 @@ const toggleDropdown = () => {
   open.value = !open.value;
   if (open.value) {
     search.value = '';
+    emit('open');
     nextTick(() => dropdownRef.value?.focus());
   }
 };
diff --git a/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue b/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue
index 46826a6cd..1ab9e9503 100644
--- a/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue
+++ b/app/javascript/dashboard/components-next/combobox/ComboBoxDropdown.vue
@@ -87,7 +87,7 @@ defineExpose({
         }"
         role="option"
         :aria-selected="isSelected(option)"
-        @click="emit('select', option)"
+        @click.stop="emit('select', option)"
       >
         <span
           :class="{
diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index 0ef64eedf..cd3c7d5dc 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -147,8 +147,14 @@ const { t } = useI18n();
 const route = useRoute();
 const inboxGetter = useMapGetter('inboxes/getInbox');
 const inbox = computed(() => inboxGetter.value(props.inboxId) || {});
+const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
 const { replaceInstallationName } = useBranding();
 
+const isCaptainMessage = computed(() => {
+  const senderType = props.sender?.type ?? props.senderType;
+  return senderType === SENDER_TYPES.CAPTAIN_ASSISTANT;
+});
+
 /**
  * Computes the message variant based on props
  * @type {import('vue').ComputedRef<'user'|'agent'|'activity'|'private'|'bot'|'template'>}
@@ -390,6 +396,10 @@ const contextMenuEnabledOptions = computed(() => {
       !props.private &&
       props.inboxSupportsReplyTo.outgoing &&
       !isFailedOrProcessing,
+    report:
+      isOnChatwootCloud.value &&
+      isCaptainMessage.value &&
+      !isMessageDeleted.value,
   };
 });
 
diff --git a/app/javascript/dashboard/i18n/locale/en/companies.json b/app/javascript/dashboard/i18n/locale/en/companies.json
index 534205038..d4cd0b72f 100644
--- a/app/javascript/dashboard/i18n/locale/en/companies.json
+++ b/app/javascript/dashboard/i18n/locale/en/companies.json
@@ -25,6 +25,10 @@
     "ACTIONS": {
       "CREATE": "Add company"
     },
+    "SELECTOR": {
+      "PLACEHOLDER": "Select company",
+      "CREATE_OPTION": "Add \"{name}\""
+    },
     "CREATE": {
       "TITLE": "Add company details",
       "ACTIONS": {
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 045b8d0d9..c34ed44de 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -304,6 +304,25 @@
         "MESSAGE": "You cannot undo this action",
         "DELETE": "Delete",
         "CANCEL": "Cancel"
+      },
+      "REPORT_MESSAGE": {
+        "LABEL": "Report message",
+        "TITLE": "Report Captain message",
+        "DESCRIPTION": "Found an issue with this AI response? Let us know what went wrong and our team will review it to help improve Captain's accuracy.",
+        "PROBLEM_TYPE": "Problem type",
+        "PROBLEM_TYPE_PLACEHOLDER": "Select a problem type",
+        "DESCRIPTION_LABEL": "Description",
+        "DESCRIPTION_PLACEHOLDER": "Describe the problem in detail",
+        "SUBMIT": "Report",
+        "SUCCESS": "Thanks for reporting. Our team will take a look.",
+        "ERROR": "Could not report this message. Please try again.",
+        "REASONS": {
+          "incorrect_information": "Incorrect information",
+          "inappropriate_response": "Inappropriate response",
+          "incomplete_response": "Incomplete response",
+          "outdated_information": "Outdated information",
+          "other": "Other"
+        }
       }
     },
     "SIDEBAR": {
diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index dfaec8119..ae099a7a9 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -552,6 +552,7 @@
         "LOCALE": {
           "ALL": "All locales"
         },
+        "SEARCH_PLACEHOLDER": "Search articles...",
         "NEW_ARTICLE": "New article"
       },
       "EMPTY_STATE": {
@@ -579,6 +580,10 @@
         "CATEGORY": {
           "TITLE": "There are no articles in this category",
           "SUBTITLE": "Articles in this category will appear here"
+        },
+        "SEARCH": {
+          "TITLE": "No matching articles",
+          "SUBTITLE": "We couldn't find any articles matching your search. Try a different term."
         }
       },
       "BULK_TRANSLATE": {
@@ -624,6 +629,7 @@
       "CATEGORY_HEADER": {
         "NEW_CATEGORY": "New category",
         "EDIT_CATEGORY": "Edit category",
+        "SEARCH_PLACEHOLDER": "Search categories...",
         "CATEGORIES_COUNT": "{n} category | {n} categories",
         "BREADCRUMB": {
           "CATEGORY_LOCALE": "Categories ({localeCode})",
@@ -634,6 +640,10 @@
         "TITLE": "No categories found",
         "SUBTITLE": "Categories will appear here. You can add a category by clicking the 'New Category' button."
       },
+      "SEARCH_EMPTY_STATE": {
+        "TITLE": "No matching categories",
+        "SUBTITLE": "We couldn't find any categories matching your search. Try a different term."
+      },
       "CATEGORY_CARD": {
         "ARTICLES_COUNT": "{count} article | {count} articles"
       },
@@ -691,6 +701,11 @@
     "LOCALES_PAGE": {
       "LOCALES_COUNT": "No locales available | {n} locale | {n} locales",
       "NEW_LOCALE_BUTTON_TEXT": "New locale",
+      "SEARCH_PLACEHOLDER": "Search locales...",
+      "SEARCH_EMPTY_STATE": {
+        "TITLE": "No matching locales",
+        "SUBTITLE": "We couldn't find any locales matching your search. Try a different term."
+      },
       "LOCALE_CARD": {
         "ARTICLES_COUNT": "{count} article | {count} articles",
         "CATEGORIES_COUNT": "{count} category | {count} categories",
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 574cf5b9b..8eefe5fde 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -65,7 +65,8 @@
         "CONNECT_YOUR_TIKTOK_PROFILE": "Connect your TikTok Profile",
         "HELP": "To add your TikTok profile as a channel, you need to authenticate your TikTok Profile by clicking on 'Continue with TikTok' ",
         "ERROR_MESSAGE": "There was an error connecting to TikTok, please try again",
-        "ERROR_AUTH": "There was an error connecting to TikTok, please try again"
+        "ERROR_AUTH": "There was an error connecting to TikTok, please try again",
+        "NORTH_AMERICA_WARNING": "TikTok connections for North American accounts are temporarily unavailable while we wait for an update from the TikTok team."
       },
       "TWITTER": {
         "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
diff --git a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
index a100b379f..4cfde97aa 100644
--- a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
+++ b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
@@ -14,6 +14,7 @@ import {
 import MenuItem from '../../../components/widgets/conversation/contextMenu/menuItem.vue';
 import { useTrack } from 'dashboard/composables';
 import NextButton from 'dashboard/components-next/button/Button.vue';
+import ReportCaptainMessageDialog from './ReportCaptainMessageDialog.vue';
 
 export default {
   components: {
@@ -21,6 +22,7 @@ export default {
     MenuItem,
     ContextMenu,
     NextButton,
+    ReportCaptainMessageDialog,
   },
   props: {
     message: {
@@ -152,6 +154,10 @@ export default {
     closeDeleteModal() {
       this.showDeleteModal = false;
     },
+    openReportDialog() {
+      this.handleClose();
+      this.$refs.reportDialog?.open();
+    },
   },
 };
 </script>
@@ -243,6 +249,16 @@ export default {
           variant="icon"
           @click.stop="showCannedResponseModal"
         />
+        <hr v-if="enabledOptions['report']" />
+        <MenuItem
+          v-if="enabledOptions['report']"
+          :option="{
+            icon: 'warning',
+            label: $t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.LABEL'),
+          }"
+          variant="icon"
+          @click.stop="openReportDialog"
+        />
         <hr v-if="enabledOptions['delete']" />
         <MenuItem
           v-if="enabledOptions['delete']"
@@ -255,6 +271,11 @@ export default {
         />
       </div>
     </ContextMenu>
+    <ReportCaptainMessageDialog
+      v-if="enabledOptions['report']"
+      ref="reportDialog"
+      :message-id="messageId"
+    />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue b/app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue
new file mode 100644
index 000000000..4d36efe78
--- /dev/null
+++ b/app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue
@@ -0,0 +1,119 @@
+<script setup>
+import { computed, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import MessageReportsAPI from 'dashboard/api/captain/messageReports';
+
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+import Select from 'dashboard/components-next/select/Select.vue';
+import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
+
+const props = defineProps({
+  messageId: { type: [Number, String], required: true },
+});
+
+const { t } = useI18n();
+const dialogRef = ref(null);
+const isLoading = ref(false);
+
+const REPORT_REASONS = [
+  'incorrect_information',
+  'inappropriate_response',
+  'incomplete_response',
+  'outdated_information',
+  'other',
+];
+
+const reasonOptions = computed(() =>
+  REPORT_REASONS.map(value => ({
+    value,
+    label: t(`CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.REASONS.${value}`),
+  }))
+);
+
+const form = reactive({ reportReason: '', description: '' });
+
+const isFormInvalid = computed(() => !form.reportReason);
+
+const resetForm = () => {
+  form.reportReason = '';
+  form.description = '';
+};
+
+const open = () => {
+  resetForm();
+  dialogRef.value?.open();
+};
+
+const close = () => {
+  dialogRef.value?.close();
+};
+
+const handleConfirm = async () => {
+  if (isFormInvalid.value) return;
+
+  isLoading.value = true;
+  try {
+    await MessageReportsAPI.create({
+      message_id: props.messageId,
+      report_reason: form.reportReason,
+      description: form.description.trim() || null,
+    });
+    useAlert(t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.SUCCESS'));
+    close();
+  } catch (error) {
+    useAlert(t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.ERROR'));
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+defineExpose({ open, close });
+</script>
+
+<template>
+  <Dialog
+    ref="dialogRef"
+    :title="t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.TITLE')"
+    :description="t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.DESCRIPTION')"
+    :confirm-button-label="t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.SUBMIT')"
+    :is-loading="isLoading"
+    :disable-confirm-button="isFormInvalid"
+    @confirm="handleConfirm"
+  >
+    <div class="flex flex-col gap-4">
+      <div class="flex flex-col gap-1">
+        <label class="text-sm font-medium text-n-slate-12">
+          {{ t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.PROBLEM_TYPE') }}
+        </label>
+        <Select
+          v-model="form.reportReason"
+          class="!w-full [&>select]:w-full"
+          :options="reasonOptions"
+          :placeholder="
+            t(
+              'CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.PROBLEM_TYPE_PLACEHOLDER'
+            )
+          "
+        />
+      </div>
+      <div class="flex flex-col gap-1">
+        <label class="text-sm font-medium text-n-slate-12">
+          {{ t('CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.DESCRIPTION_LABEL') }}
+        </label>
+        <TextArea
+          v-model="form.description"
+          class="w-full"
+          :placeholder="
+            t(
+              'CONVERSATION.CONTEXT_MENU.REPORT_MESSAGE.DESCRIPTION_PLACEHOLDER'
+            )
+          "
+          :max-length="500"
+          show-character-count
+          auto-height
+        />
+      </div>
+    </div>
+  </Dialog>
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
index 08d4c0c7a..1de642fbe 100644
--- a/app/javascript/dashboard/modules/search/components/SearchHeader.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, useTemplateRef } from 'vue';
+import { ref, useTemplateRef } from 'vue';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
 import { ROLES } from 'dashboard/constants/permissions';
@@ -30,16 +30,6 @@ const onSelectRecentSearch = query => {
   searchQuery.value = query;
   onSearch(query);
 };
-
-watch(
-  () => props.initialQuery,
-  newValue => {
-    if (searchQuery.value !== newValue) {
-      searchQuery.value = newValue;
-    }
-  },
-  { immediate: true }
-);
 </script>
 
 <template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchInput.vue b/app/javascript/dashboard/modules/search/components/SearchInput.vue
index 3edd79fe0..de2db176f 100644
--- a/app/javascript/dashboard/modules/search/components/SearchInput.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchInput.vue
@@ -30,10 +30,13 @@ const debouncedEmit = debounce(
   500
 );
 
-const onInput = () => {
-  debouncedEmit(searchQuery.value);
+const onInput = e => {
+  // Use the DOM value, not searchQuery.value: the defineModel ref updates a tick
+  // later, so reading it back here lags one character behind.
+  const value = e.target.value;
+  debouncedEmit(value);
 
-  if (searchQuery.value.trim()) {
+  if (value.trim()) {
     showRecentSearches.value = false;
   } else if (isInputFocused.value) {
     showRecentSearches.value = true;
diff --git a/app/javascript/dashboard/modules/search/components/SearchTabs.vue b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
index 86e40df57..1a0fea65c 100644
--- a/app/javascript/dashboard/modules/search/components/SearchTabs.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { computed, watch, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
-import Button from 'dashboard/components-next/button/Button.vue';
 
 const props = defineProps({
   tabs: {
@@ -17,8 +15,6 @@ const props = defineProps({
 
 const emit = defineEmits(['tabChange']);
 
-const { t } = useI18n();
-
 const activeTab = ref(props.selectedTab);
 
 watch(
@@ -51,14 +47,5 @@ const onTabChange = selectedTab => {
       :initial-active-tab="activeTab"
       @tab-changed="onTabChange"
     />
-
-    <Button
-      :label="t('SEARCH.SORT_BY.RELEVANCE')"
-      sm
-      link
-      slate
-      class="hover:!no-underline pointer-events-none lg:inline-flex hidden"
-      icon="i-lucide-arrow-up-down"
-    />
   </div>
 </template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
index 4a638224c..fdca9d35a 100644
--- a/app/javascript/dashboard/modules/search/components/SearchView.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -1,8 +1,9 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
 import { useMapGetter, useStore } from 'dashboard/composables/store.js';
 import { useRouter, useRoute } from 'vue-router';
 import { useTrack } from 'dashboard/composables';
+import { useAccount } from 'dashboard/composables/useAccount';
 import { useI18n } from 'vue-i18n';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
 import { generateURLParams, parseURLParams } from '../helpers/searchHelper';
@@ -28,6 +29,7 @@ import SearchResultArticlesList from './SearchResultArticlesList.vue';
 const router = useRouter();
 const route = useRoute();
 const store = useStore();
+const { currentAccount } = useAccount();
 const { t } = useI18n();
 
 const PER_PAGE = 15; // Results per page
@@ -338,19 +340,26 @@ const onTabChange = tab => {
 onMounted(() => {
   store.dispatch('conversationSearch/clearSearchResults');
   store.dispatch('agents/get');
-
-  const parsedFilters = parseURLParams(
-    route.query,
-    isFeatureFlagEnabled(FEATURE_FLAGS.ADVANCED_SEARCH)
-  );
-  filters.value = parsedFilters;
-
-  // Auto-execute search if query parameter exists
-  if (route.query.q) {
-    onSearch(route.query.q);
-  }
 });
 
+// Wait for the account before restoring URL filters: the ADVANCED_SEARCH flag
+// derives from account.features (loaded async), and reading it too early strips
+// the filter params from the URL. `immediate` covers the already-loaded case.
+watch(
+  () => currentAccount.value?.id,
+  id => {
+    if (!id) return;
+    filters.value = parseURLParams(
+      route.query,
+      isFeatureFlagEnabled(FEATURE_FLAGS.ADVANCED_SEARCH)
+    );
+    if (route.query.q) {
+      onSearch(route.query.q);
+    }
+  },
+  { immediate: true }
+);
+
 onUnmounted(() => {
   query.value = '';
   store.dispatch('conversationSearch/clearSearchResults');
diff --git a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
index 8ec401376..24872ef95 100644
--- a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
+++ b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
@@ -126,7 +126,7 @@ const showCompany = companyId => {
 };
 
 const openCreateCompanyDialog = () => {
-  createCompanyDialogRef.value?.dialogRef.open();
+  createCompanyDialogRef.value?.open();
 };
 
 const createCompany = async company => {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue
index c0fc800e6..5b563203d 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue
@@ -1,15 +1,17 @@
 <script setup>
 import { computed, ref, onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useMapGetter, useStore } from 'dashboard/composables/store.js';
 import allLocales from 'shared/constants/locales.js';
 import { getArticleStatus } from 'dashboard/helper/portalHelper.js';
 import ArticlesPage from 'dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue';
 
 const route = useRoute();
+const router = useRouter();
 const store = useStore();
 
 const pageNumber = ref(1);
+const searchQuery = ref(route.query.search || '');
 
 const allArticles = useMapGetter('articles/allArticles');
 const articlesSortedByPosition = useMapGetter(
@@ -74,6 +76,7 @@ const fetchArticles = ({ pageNumber: pageNumberParam } = {}) => {
     status: status.value,
     authorId: author.value,
     categorySlug: selectedCategorySlug.value,
+    query: searchQuery.value || undefined,
   });
 };
 
@@ -81,6 +84,15 @@ const onPageChange = pageNumberParam => {
   fetchArticles({ pageNumber: pageNumberParam });
 };
 
+const onSearch = query => {
+  searchQuery.value = query;
+  pageNumber.value = 1;
+  router.replace({
+    query: { ...route.query, search: query || undefined },
+  });
+  fetchArticles({ pageNumber: 1 });
+};
+
 const fetchPortalAndItsCategories = async locale => {
   await store.dispatch('portals/index');
   const selectedPortalParam = {
@@ -118,6 +130,7 @@ watch(
       :portal-meta="portalMeta"
       :is-category-articles="isCategoryArticles"
       @page-change="onPageChange"
+      @search="onSearch"
       @fetch-portal="fetchPortalAndItsCategories"
       @refresh-articles="fetchArticles"
     />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Tiktok.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Tiktok.vue
index 50a326835..50f253603 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Tiktok.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Tiktok.vue
@@ -3,8 +3,12 @@ import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import tiktokClient from 'dashboard/api/channel/tiktokClient';
 import Button from 'dashboard/components-next/button/Button.vue';
+import Banner from 'dashboard/components-next/banner/Banner.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import { useAccount } from 'dashboard/composables/useAccount';
 
 const { t } = useI18n();
+const { isOnChatwootCloud } = useAccount();
 
 const hasError = ref(false);
 const errorStateMessage = ref('');
@@ -56,23 +60,37 @@ const requestAuthorization = async () => {
       </div>
       <div
         v-else
-        class="flex flex-col items-center justify-center px-8 py-10 text-center rounded-2xl outline outline-1 outline-n-weak"
+        class="flex flex-col items-center justify-center w-full px-8 py-10 text-center rounded-2xl outline outline-1 outline-n-weak"
       >
-        <h6 class="text-2xl font-medium">
-          {{ $t('INBOX_MGMT.ADD.TIKTOK.CONNECT_YOUR_TIKTOK_PROFILE') }}
-        </h6>
-        <p class="py-6 text-sm text-n-slate-11">
-          {{ $t('INBOX_MGMT.ADD.TIKTOK.HELP') }}
-        </p>
-        <Button
-          class="text-white !rounded-full !px-6 bg-gradient-to-r from-[#00f2ea] via-[#ff0050] to-[#000000]"
-          lg
-          icon="i-ri-tiktok-line"
-          :disabled="isRequestingAuthorization"
-          :is-loading="isRequestingAuthorization"
-          :label="$t('INBOX_MGMT.ADD.TIKTOK.CONTINUE_WITH_TIKTOK')"
-          @click="requestAuthorization()"
-        />
+        <div class="flex flex-col items-center w-full max-w-2xl">
+          <h6 class="text-2xl font-medium">
+            {{ $t('INBOX_MGMT.ADD.TIKTOK.CONNECT_YOUR_TIKTOK_PROFILE') }}
+          </h6>
+          <p class="max-w-xl py-6 text-sm text-n-slate-11">
+            {{ $t('INBOX_MGMT.ADD.TIKTOK.HELP') }}
+          </p>
+
+          <Button
+            class="text-white !rounded-full !px-6 bg-gradient-to-r from-[#00f2ea] via-[#ff0050] to-[#000000]"
+            lg
+            icon="i-ri-tiktok-line"
+            :disabled="isRequestingAuthorization"
+            :is-loading="isRequestingAuthorization"
+            :label="$t('INBOX_MGMT.ADD.TIKTOK.CONTINUE_WITH_TIKTOK')"
+            @click="requestAuthorization()"
+          />
+          <Banner v-if="isOnChatwootCloud" color="amber" class="w-full mt-6">
+            <div class="flex items-start gap-3 text-left">
+              <Icon
+                icon="i-lucide-triangle-alert"
+                class="flex-shrink-0 size-4 mt-0.5"
+              />
+              <span>
+                {{ $t('INBOX_MGMT.ADD.TIKTOK.NORTH_AMERICA_WARNING') }}
+              </span>
+            </div>
+          </Banner>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/javascript/dashboard/store/modules/contacts/actions.js b/app/javascript/dashboard/store/modules/contacts/actions.js
index 76bbf1f26..48596c0be 100644
--- a/app/javascript/dashboard/store/modules/contacts/actions.js
+++ b/app/javascript/dashboard/store/modules/contacts/actions.js
@@ -13,8 +13,12 @@ const buildContactFormData = contactParams => {
   const formData = new FormData();
   const { additional_attributes = {}, ...contactProperties } = contactParams;
   Object.keys(contactProperties).forEach(key => {
-    if (contactProperties[key]) {
-      formData.append(key, contactProperties[key]);
+    const value = contactProperties[key];
+    const shouldAppendBlankCompanyId =
+      key === 'company_id' && value !== undefined;
+
+    if (value || shouldAppendBlankCompanyId) {
+      formData.append(key, value ?? '');
     }
   });
   const { social_profiles, ...additionalAttributesProperties } =
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
index 229a42a5d..85449b174 100644
--- a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
@@ -7,7 +7,7 @@ import types from '../../mutation-types';
 export const actions = {
   index: async (
     { commit },
-    { pageNumber, portalSlug, locale, status, authorId, categorySlug }
+    { pageNumber, portalSlug, locale, status, authorId, categorySlug, query }
   ) => {
     try {
       commit(types.SET_UI_FLAG, { isFetching: true });
@@ -18,6 +18,7 @@ export const actions = {
         status,
         authorId,
         categorySlug,
+        query,
       });
       const payload = camelcaseKeys(data.payload);
       const meta = camelcaseKeys(data.meta);
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
index bb2f0393b..9d9a6780b 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -145,6 +145,33 @@ describe('#actions', () => {
         [types.SET_CONTACT_UI_FLAG, { isUpdating: false }],
       ]);
     });
+
+    it('preserves blank company_id when updating with form data', async () => {
+      axios.patch.mockResolvedValue({ data: { payload: contactList[0] } });
+
+      await actions.update(
+        { commit },
+        {
+          id: contactList[0].id,
+          isFormData: true,
+          name: contactList[0].name,
+          companyId: '',
+          avatar: 'avatar-file',
+          additionalAttributes: {
+            companyName: '',
+            socialProfiles: {},
+          },
+        }
+      );
+
+      const lastPatchCall =
+        axios.patch.mock.calls[axios.patch.mock.calls.length - 1];
+      const formData = lastPatchCall[1];
+
+      expect(formData).toBeInstanceOf(FormData);
+      expect(formData.has('company_id')).toBe(true);
+      expect(formData.get('company_id')).toBe('');
+    });
   });
 
   describe('#create', () => {
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 3badf478d..3b04e6bc1 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -148,7 +148,7 @@ class Contact < ApplicationRecord
   end
 
   def push_event_data
-    {
+    data = {
       additional_attributes: additional_attributes,
       custom_attributes: custom_attributes,
       email: email,
@@ -160,6 +160,8 @@ class Contact < ApplicationRecord
       blocked: blocked,
       type: 'contact'
     }
+    data[:company_id] = company_id if account.feature_enabled?('companies')
+    data
   end
 
   def webhook_data
diff --git a/app/services/user_session_tracking_service.rb b/app/services/user_session_tracking_service.rb
index 28f272a18..d7e6f6efb 100644
--- a/app/services/user_session_tracking_service.rb
+++ b/app/services/user_session_tracking_service.rb
@@ -1,4 +1,11 @@
 class UserSessionTrackingService
+  # CFNetwork UAs cannot distinguish iPhone from iPad; both get labelled iPhone here.
+  LEGACY_MOBILE_UAS = [
+    { match: %r{\Aokhttp/}, platform: 'Android', device: 'Android' },
+    { match: %r{\AChatwoot/.*CFNetwork.*Darwin}, platform: 'iPhone', device: 'iPhone' }
+  ].freeze
+  private_constant :LEGACY_MOBILE_UAS
+
   def initialize(user:, request:, client_id:)
     @user = user
     @request = request
@@ -26,7 +33,7 @@ class UserSessionTrackingService
   def session_attributes
     browser = Browser.new(@request.user_agent)
 
-    {
+    attrs = {
       ip_address: @request.remote_ip,
       user_agent: @request.user_agent,
       browser_name: browser.name,
@@ -35,5 +42,22 @@ class UserSessionTrackingService
       platform_name: browser.platform.name,
       platform_version: browser.platform.version
     }
+
+    patch_for_legacy_mobile(attrs)
+  end
+
+  def patch_for_legacy_mobile(attrs)
+    return attrs unless attrs[:browser_name] == 'Unknown Browser'
+
+    hit = LEGACY_MOBILE_UAS.find { |m| @request.user_agent.to_s.match?(m[:match]) }
+    return attrs unless hit
+
+    attrs.merge(
+      browser_name: 'Chatwoot Mobile',
+      browser_version: nil,
+      platform_name: hit[:platform],
+      platform_version: nil,
+      device_name: hit[:device]
+    )
   end
 end
diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
index 4e998ddf1..a76166a57 100644
--- a/app/views/api/v1/models/_contact.json.jbuilder
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -6,6 +6,7 @@ json.name resource.name
 json.phone_number resource.phone_number
 json.blocked resource.blocked
 json.identifier resource.identifier
+json.company_id resource.company_id if Current.account&.feature_enabled?('companies')
 json.thumbnail resource.avatar_url
 json.custom_attributes resource.custom_attributes
 json.last_activity_at resource.last_activity_at.to_i if resource[:last_activity_at].present?
diff --git a/config/app.yml b/config/app.yml
index c2494befa..a55b621f6 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.14.2'
+  version: '4.15.1'
 
 development:
   <<: *shared
diff --git a/config/features.yml b/config/features.yml
index 03105588b..c5bc8f608 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -200,7 +200,6 @@
   display_name: Advanced Search
   enabled: false
   premium: true
-  chatwoot_internal: true
 - name: saml
   display_name: SAML
   enabled: false
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 0158e3284..ca818c080 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -203,6 +203,15 @@ class Rack::Attack
     match_data[:account_id] if match_data.present?
   end
 
+  ## Prevent abuse of conversation delete API (per account)
+  throttle('/api/v1/accounts/:account_id/conversations/:id DELETE',
+           limit: ENV.fetch('RATE_LIMIT_CONVERSATION_DELETE', '60').to_i, period: 1.minute) do |req|
+    next unless req.delete?
+
+    match_data = %r{\A/api/v1/accounts/(?<account_id>\d+)/conversations/(?<id>\d+)/?\z}.match(req.path_without_extensions)
+    match_data[:account_id] if match_data.present?
+  end
+
   ## Prevent Abuse of attachment upload APIs ##
   throttle('/api/v1/accounts/:account_id/upload', limit: 60, period: 1.hour) do |req|
     match_data = %r{/api/v1/accounts/(?<account_id>\d+)/upload}.match(req.path)
diff --git a/config/routes.rb b/config/routes.rb
index f86e3f2cb..64e1df440 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,6 +74,7 @@ Rails.application.routes.draw do
               resources :scenarios
             end
             resources :assistant_responses
+            resources :message_reports, only: [:create]
             resources :bulk_actions, only: [:create]
             resources :copilot_threads, only: [:index, :create] do
               resources :copilot_messages, only: [:index, :create]
diff --git a/db/migrate/20260620000000_create_captain_message_reports.rb b/db/migrate/20260620000000_create_captain_message_reports.rb
new file mode 100644
index 000000000..41fc2f037
--- /dev/null
+++ b/db/migrate/20260620000000_create_captain_message_reports.rb
@@ -0,0 +1,14 @@
+class CreateCaptainMessageReports < ActiveRecord::Migration[7.1]
+  def change
+    create_table :captain_message_reports do |t|
+      t.references :account, null: false
+      t.references :conversation, null: false
+      t.references :message, null: false
+      t.references :user, null: false
+      t.string :report_reason, null: false
+      t.text :description
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cbddbcce2..a3513ca83 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2026_06_11_184600) do
+ActiveRecord::Schema[7.1].define(version: 2026_06_20_000000) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -399,6 +399,21 @@ ActiveRecord::Schema[7.1].define(version: 2026_06_11_184600) do
     t.index ["inbox_id"], name: "index_captain_inboxes_on_inbox_id"
   end
 
+  create_table "captain_message_reports", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "conversation_id", null: false
+    t.bigint "message_id", null: false
+    t.bigint "user_id", null: false
+    t.string "report_reason", null: false
+    t.text "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_captain_message_reports_on_account_id"
+    t.index ["conversation_id"], name: "index_captain_message_reports_on_conversation_id"
+    t.index ["message_id"], name: "index_captain_message_reports_on_message_id"
+    t.index ["user_id"], name: "index_captain_message_reports_on_user_id"
+  end
+
   create_table "captain_scenarios", force: :cascade do |t|
     t.string "title"
     t.text "description"
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb
new file mode 100644
index 000000000..abce5ffcc
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb
@@ -0,0 +1,38 @@
+class Api::V1::Accounts::Captain::MessageReportsController < Api::V1::Accounts::BaseController
+  before_action :ensure_cloud_installation
+  before_action :set_message
+  before_action :authorize_conversation
+  before_action :ensure_captain_message
+
+  def create
+    @message_report = @message.message_reports.create!(
+      user: Current.user,
+      report_reason: permitted_params[:report_reason],
+      description: permitted_params[:description]
+    )
+  end
+
+  private
+
+  def ensure_cloud_installation
+    render json: { error: 'Not available' }, status: :not_found unless ChatwootApp.chatwoot_cloud?
+  end
+
+  def set_message
+    @message = Current.account.messages.find(permitted_params[:message_id])
+  end
+
+  def authorize_conversation
+    authorize @message.conversation, :show?
+  end
+
+  def ensure_captain_message
+    return if @message.sender_type == 'Captain::Assistant'
+
+    render json: { error: 'Only Captain messages can be reported' }, status: :unprocessable_entity
+  end
+
+  def permitted_params
+    params.permit(:message_id, :report_reason, :description)
+  end
+end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb
new file mode 100644
index 000000000..42ddbf6a2
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb
@@ -0,0 +1,17 @@
+module Enterprise::Api::V1::Accounts::ContactsController
+  private
+
+  def permitted_params
+    params_with_company_id = super
+    return params_with_company_id unless Current.account.feature_enabled?('companies')
+    return params_with_company_id unless params.key?(:company_id)
+
+    params_with_company_id.merge(company_id: permitted_company_id)
+  end
+
+  def permitted_company_id
+    return nil if params[:company_id].blank?
+
+    Current.account.companies.find(params[:company_id]).id
+  end
+end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts_settings.rb b/enterprise/app/controllers/enterprise/api/v1/accounts_settings.rb
index bdcbfc1d3..0ef648567 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts_settings.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts_settings.rb
@@ -1,6 +1,20 @@
 module Enterprise::Api::V1::AccountsSettings
+  def create
+    super
+    record_marketing_attribution
+  end
+
   private
 
+  def record_marketing_attribution
+    return if current_user.present?
+    return if @account.blank?
+
+    Internal::Accounts::MarketingAttributionService.new(account: @account, cookies: cookies).perform
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e).capture_exception
+  end
+
   def permitted_settings_attributes
     super + [{ conversation_required_attributes: [] }]
   end
diff --git a/enterprise/app/models/captain/message_report.rb b/enterprise/app/models/captain/message_report.rb
new file mode 100644
index 000000000..4fcb609fe
--- /dev/null
+++ b/enterprise/app/models/captain/message_report.rb
@@ -0,0 +1,46 @@
+# == Schema Information
+#
+# Table name: captain_message_reports
+#
+#  id              :bigint           not null, primary key
+#  description     :text
+#  report_reason   :string           not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  account_id      :bigint           not null
+#  conversation_id :bigint           not null
+#  message_id      :bigint           not null
+#  user_id         :bigint           not null
+#
+# Indexes
+#
+#  index_captain_message_reports_on_account_id       (account_id)
+#  index_captain_message_reports_on_conversation_id  (conversation_id)
+#  index_captain_message_reports_on_message_id       (message_id)
+#  index_captain_message_reports_on_user_id          (user_id)
+#
+class Captain::MessageReport < ApplicationRecord
+  self.table_name = 'captain_message_reports'
+
+  REPORT_REASONS = %w[incorrect_information inappropriate_response incomplete_response outdated_information other].freeze
+
+  belongs_to :account
+  # `Captain::Conversation` exists as a job namespace, so the association would
+  # resolve to that module instead of the top-level model without this override.
+  belongs_to :conversation, class_name: '::Conversation'
+  belongs_to :message
+  belongs_to :user
+
+  validates :report_reason, presence: true, inclusion: { in: REPORT_REASONS }
+
+  before_validation :ensure_account_and_conversation
+
+  private
+
+  def ensure_account_and_conversation
+    return if message.blank?
+
+    self.account ||= message.account
+    self.conversation ||= message.conversation
+  end
+end
diff --git a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
index 0937c7b82..9b5093507 100644
--- a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
+++ b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
@@ -75,6 +75,14 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
   end
 
   def plan_email_limit
+    base_limit = plan_base_email_limit
+    return nil if base_limit.nil?
+    return base_limit if free_plan?
+
+    base_limit * [agent_limits.to_i, 1].max
+  end
+
+  def plan_base_email_limit
     config = InstallationConfig.find_by(name: 'ACCOUNT_EMAILS_PLAN_LIMITS')&.value
     return nil if config.blank? || plan_name.blank?
 
@@ -84,6 +92,11 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
     nil
   end
 
+  def free_plan?
+    default_plan = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')&.value&.first
+    default_plan.present? && plan_name&.downcase == default_plan['name']&.downcase
+  end
+
   def default_captain_limits
     max_limits = { documents: ChatwootApp.max_limit, responses: ChatwootApp.max_limit }.with_indifferent_access
     zero_limits = { documents: 0, responses: 0 }.with_indifferent_access
diff --git a/enterprise/app/models/enterprise/concerns/contact.rb b/enterprise/app/models/enterprise/concerns/contact.rb
index 84661c991..4362a915d 100644
--- a/enterprise/app/models/enterprise/concerns/contact.rb
+++ b/enterprise/app/models/enterprise/concerns/contact.rb
@@ -6,6 +6,7 @@ module Enterprise::Concerns::Contact
     after_commit :associate_company_from_email,
                  on: [:create, :update],
                  if: :should_associate_company?
+    before_save :sync_company_name_from_company, if: :will_save_change_to_company_id?
     after_update_commit :record_company_activity, if: :saved_change_to_last_activity_at?
   end
 
@@ -33,4 +34,14 @@ module Enterprise::Concerns::Contact
   def record_company_activity
     company&.record_activity_at!(last_activity_at) if last_activity_at.present?
   end
+
+  def sync_company_name_from_company
+    self.additional_attributes ||= {}
+
+    if company_id.present?
+      additional_attributes['company_name'] = company&.name
+    else
+      additional_attributes.delete('company_name')
+    end
+  end
 end
diff --git a/enterprise/app/models/enterprise/concerns/message.rb b/enterprise/app/models/enterprise/concerns/message.rb
index cfdea430b..3c7cdc3f7 100644
--- a/enterprise/app/models/enterprise/concerns/message.rb
+++ b/enterprise/app/models/enterprise/concerns/message.rb
@@ -3,5 +3,6 @@ module Enterprise::Concerns::Message
 
   included do
     has_one :call, dependent: :nullify
+    has_many :message_reports, class_name: 'Captain::MessageReport', dependent: :destroy_async
   end
 end
diff --git a/enterprise/app/services/contacts/company_association_service.rb b/enterprise/app/services/contacts/company_association_service.rb
index 9039e2a31..20c5ec4e4 100644
--- a/enterprise/app/services/contacts/company_association_service.rb
+++ b/enterprise/app/services/contacts/company_association_service.rb
@@ -6,7 +6,7 @@ class Contacts::CompanyAssociationService
     if company
       # rubocop:disable Rails/SkipsModelValidations
       # Using update_column and increment_counter to avoid triggering callbacks while maintaining counter cache
-      contact.update_column(:company_id, company.id)
+      contact.update_columns(company_id: company.id, additional_attributes: contact_attributes_with_company_name(contact, company))
       Company.increment_counter(:contacts_count, company.id)
       # rubocop:enable Rails/SkipsModelValidations
       company.record_activity_at!(contact.last_activity_at) if contact.last_activity_at.present?
@@ -45,4 +45,8 @@ class Contacts::CompanyAssociationService
   def derive_company_name(contact, domain)
     contact.additional_attributes&.dig('company_name') || domain.split('.').first.tr('-_', ' ').titleize
   end
+
+  def contact_attributes_with_company_name(contact, company)
+    (contact.additional_attributes || {}).merge('company_name' => company.name)
+  end
 end
diff --git a/enterprise/app/services/enterprise/billing/reconcile_plan_features_service.rb b/enterprise/app/services/enterprise/billing/reconcile_plan_features_service.rb
index a6f76f6b5..fea5b7664 100644
--- a/enterprise/app/services/enterprise/billing/reconcile_plan_features_service.rb
+++ b/enterprise/app/services/enterprise/billing/reconcile_plan_features_service.rb
@@ -13,6 +13,7 @@ class Enterprise::Billing::ReconcilePlanFeaturesService
     channel_instagram
     channel_tiktok
     captain_integration
+    captain_document_auto_sync
     advanced_search_indexing
     advanced_search
     linear_integration
diff --git a/enterprise/app/services/internal/accounts/internal_attributes_service.rb b/enterprise/app/services/internal/accounts/internal_attributes_service.rb
index d119d6345..593cea799 100644
--- a/enterprise/app/services/internal/accounts/internal_attributes_service.rb
+++ b/enterprise/app/services/internal/accounts/internal_attributes_service.rb
@@ -4,7 +4,7 @@ class Internal::Accounts::InternalAttributesService
   # List of keys that can be managed through this service
   # TODO: Add account_notes field in future
   # This field can be used to store notes about account on Chatwoot cloud
-  VALID_KEYS = %w[manually_managed_features].freeze
+  VALID_KEYS = %w[manually_managed_features marketing_attribution].freeze
 
   def initialize(account)
     @account = account
diff --git a/enterprise/app/services/internal/accounts/marketing_attribution_service.rb b/enterprise/app/services/internal/accounts/marketing_attribution_service.rb
new file mode 100644
index 000000000..08bb93823
--- /dev/null
+++ b/enterprise/app/services/internal/accounts/marketing_attribution_service.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'base64'
+
+class Internal::Accounts::MarketingAttributionService
+  FIRST_TOUCH_COOKIE = 'cw_first_touch_attribution'
+  LAST_TOUCH_COOKIE = 'cw_last_touch_attribution'
+  FIELD_MAX_LENGTH = 500
+  ALLOWED_FIELDS = %w[
+    utm_source
+    utm_medium
+    utm_campaign
+    utm_term
+    utm_content
+    utm_id
+    gclid
+    gbraid
+    wbraid
+    dclid
+    fbclid
+    msclkid
+    ttclid
+    li_fat_id
+    twclid
+    rdt_cid
+    referrer
+    referrer_path
+    landing_page
+    source
+    source_type
+    captured_at
+  ].freeze
+
+  pattr_initialize [:account!, :cookies!]
+
+  def perform
+    return unless ChatwootApp.chatwoot_cloud?
+
+    first_touch = attribution_cookie(FIRST_TOUCH_COOKIE)
+    last_touch = attribution_cookie(LAST_TOUCH_COOKIE)
+    return unless first_touch || last_touch
+
+    existing_attribution = internal_attributes_service.get('marketing_attribution') || {}
+    internal_attributes_service.set(
+      'marketing_attribution',
+      {
+        'first_touch' => first_touch || existing_attribution['first_touch'],
+        'last_touch' => last_touch || existing_attribution['last_touch'],
+        'captured_from' => 'cookie',
+        'stored_at' => Time.current.iso8601
+      }.compact
+    )
+  end
+
+  private
+
+  def attribution_cookie(cookie_name)
+    return if cookies[cookie_name].blank?
+
+    parse_cookie(cookies[cookie_name].to_s)
+  end
+
+  def parse_cookie(cookie_value)
+    validate_payload(JSON.parse(Base64.urlsafe_decode64(cookie_value)))
+  rescue JSON::ParserError, ArgumentError
+    nil
+  end
+
+  def validate_payload(payload)
+    return unless payload.is_a?(Hash)
+
+    payload.slice(*ALLOWED_FIELDS).filter_map do |key, value|
+      next if value.blank? || value.is_a?(Array) || value.is_a?(Hash)
+
+      [key, value.to_s.first(FIELD_MAX_LENGTH)]
+    end.to_h.presence
+  end
+
+  def internal_attributes_service
+    @internal_attributes_service ||= Internal::Accounts::InternalAttributesService.new(account)
+  end
+end
diff --git a/enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder
new file mode 100644
index 000000000..f45c0078b
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder
@@ -0,0 +1,7 @@
+json.id @message_report.id
+json.message_id @message_report.message_id
+json.conversation_id @message_report.conversation_id
+json.user_id @message_report.user_id
+json.report_reason @message_report.report_reason
+json.description @message_report.description
+json.created_at @message_report.created_at.to_i
diff --git a/enterprise/config/premium_features.yml b/enterprise/config/premium_features.yml
index 0cb89df01..282319fe7 100644
--- a/enterprise/config/premium_features.yml
+++ b/enterprise/config/premium_features.yml
@@ -4,5 +4,6 @@
 - sla
 - custom_roles
 - captain_integration
+- captain_document_auto_sync
 - csat_review_notes
 - conversation_required_attributes
diff --git a/lib/active_storage/migrator.rb b/lib/active_storage/migrator.rb
new file mode 100644
index 000000000..0fdf1669d
--- /dev/null
+++ b/lib/active_storage/migrator.rb
@@ -0,0 +1,52 @@
+require 'yaml'
+require 'erb'
+
+class ActiveStorage::Migrator
+  def self.migrate(from_service_name, to_service_name, should_update_service_name: true)
+    configs = load_storage_config
+    # Check if services are configured correctly
+    if configs[from_service_name.to_s].nil? || configs[to_service_name.to_s].nil?
+      raise "Error: The services '#{from_service_name}' or '#{to_service_name}' are not configured correctly."
+    end
+
+    from_service = configure_service(from_service_name, configs)
+
+    configure_blob_service(from_service)
+
+    migrate_blobs(from_service_name, to_service_name, should_update_service_name: should_update_service_name)
+  end
+
+  def self.load_storage_config
+    yaml_with_env = ERB.new(File.read('config/storage.yml')).result
+    YAML.load(yaml_with_env)
+  end
+
+  def self.configure_blob_service(service)
+    ActiveStorage::Blob.service = service
+  end
+
+  def self.configure_service(service_name, configs = load_storage_config)
+    service_config = configs[service_name.to_s]
+    ActiveStorage::Service.configure(service_name, { service_name.to_sym => service_config })
+  end
+
+  def self.migrate_blobs(from_service_name, to_service_name, should_update_service_name: true)
+    to_service = configure_service(to_service_name)
+    blobs = ActiveStorage::Blob.where(service_name: from_service_name.to_s)
+    Rails.logger.debug { "#{blobs.count} Blobs to migrate from #{from_service_name} to #{to_service_name}" }
+
+    blobs.find_each do |blob|
+      Rails.logger.debug { '.' }
+
+      blob.open do |io|
+        checksum = blob.checksum
+        to_service.upload(blob.key, io, checksum: checksum)
+      end
+
+      blob.update!(service_name: to_service_name.to_s) if should_update_service_name
+    rescue ActiveStorage::FileNotFoundError => e
+      Rails.logger.warn { "Skipping missing blob #{blob.id} (#{blob.key}): #{e.message}" }
+    end
+    Rails.logger.debug { 'Successful migration' }
+  end
+end
diff --git a/lib/tasks/storage_migrations.rake b/lib/tasks/storage_migrations.rake
new file mode 100644
index 000000000..9a864db4e
--- /dev/null
+++ b/lib/tasks/storage_migrations.rake
@@ -0,0 +1,13 @@
+namespace :storage do
+  desc 'Migrate blobs from one storage service to another'
+  # Example: FROM=local TO=amazon UPDATE_BLOB_SERVICE_NAME=true bundle exec rake storage:migrate
+  task migrate: :environment do
+    from_service = ENV.fetch('FROM', nil)
+    to_service = ENV.fetch('TO', nil)
+    should_update_service_name = ActiveModel::Type::Boolean.new.cast(ENV.fetch('UPDATE_BLOB_SERVICE_NAME', true))
+
+    raise 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate' if from_service.nil? || to_service.nil?
+
+    ActiveStorage::Migrator.migrate(from_service.to_sym, to_service.to_sym, should_update_service_name: should_update_service_name)
+  end
+end
diff --git a/package.json b/package.json
index fc4598bc4..65dd48d27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "4.14.2",
+  "version": "4.15.1",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",
diff --git a/spec/builders/messages/facebook/message_builder_spec.rb b/spec/builders/messages/facebook/message_builder_spec.rb
index afa9d5f34..7718d23eb 100644
--- a/spec/builders/messages/facebook/message_builder_spec.rb
+++ b/spec/builders/messages/facebook/message_builder_spec.rb
@@ -140,6 +140,66 @@ describe Messages::Facebook::MessageBuilder do
       end
     end
 
+    context 'when message contains a sticker attachment' do
+      let(:sticker_url) { 'https://scontent.xx.fbcdn.net/sticker.png' }
+      let(:sticker_message_object) do
+        {
+          messaging: {
+            sender: { id: '3383290475046708' },
+            recipient: { id: facebook_channel.page_id },
+            timestamp: 1_772_452_164_516,
+            message: {
+              mid: 'm_sticker_test',
+              attachments: [
+                { type: 'image', payload: { url: sticker_url } },
+                { type: 'sticker', payload: { url: sticker_url } }
+              ]
+            }
+          }
+        }.to_json
+      end
+      let(:sticker_message) { Integrations::Facebook::MessageParser.new(sticker_message_object) }
+
+      before do
+        allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+        allow(fb_object).to receive(:get_object).and_return(
+          { first_name: 'Jane', last_name: 'Dae', profile_pic: 'https://chatwoot-assets.local/sample.png' }.with_indifferent_access
+        )
+        stub_request(:get, sticker_url).to_return(status: 200, body: 'sticker_data', headers: { 'Content-Type' => 'image/png' })
+      end
+
+      it 'stores the sticker as a single image attachment' do
+        described_class.new(sticker_message, facebook_channel.inbox).perform
+
+        message = facebook_channel.inbox.messages.find_by(source_id: 'm_sticker_test')
+        expect(message.attachments.count).to eq(1)
+        expect(message.attachments.first.file_type).to eq('image')
+        expect(message.attachments.first.external_url).to eq(sticker_url)
+      end
+
+      it 'keeps duplicate non-sticker attachments that share a URL' do
+        duplicate_image_object = {
+          messaging: {
+            sender: { id: '3383290475046708' },
+            recipient: { id: facebook_channel.page_id },
+            message: {
+              mid: 'm_duplicate_image_test',
+              attachments: [
+                { type: 'image', payload: { url: sticker_url } },
+                { type: 'image', payload: { url: sticker_url } }
+              ]
+            }
+          }
+        }.to_json
+        duplicate_image_message = Integrations::Facebook::MessageParser.new(duplicate_image_object)
+
+        described_class.new(duplicate_image_message, facebook_channel.inbox).perform
+
+        message = facebook_channel.inbox.messages.find_by(source_id: 'm_duplicate_image_test')
+        expect(message.attachments.count).to eq(2)
+      end
+    end
+
     [
       {
         source_id: 'm_fallback_test',
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 2255a1215..9468b273c 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -112,15 +112,15 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'returns all contacts with company name asc order with null values at last' do
+        contact_3
         get "/api/v1/accounts/#{account.id}/contacts?include_contact_inboxes=false&sort=-company_name",
             headers: admin.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
         response_body = response.parsed_body
-        expect(response_body['payload'].first['email']).to eq(contact_1.email)
-        expect(response_body['payload'].first['id']).to eq(contact_1.id)
-        expect(response_body['payload'].last['email']).to eq(contact_4.email)
+        expect(response_body['payload'].first(2).pluck('id')).to contain_exactly(contact.id, contact_1.id)
+        expect(response_body['payload'].last(2).pluck('id')).to contain_exactly(contact_3.id, contact_4.id)
       end
 
       it 'returns all contacts with country name desc order with null values at last' do
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb
new file mode 100644
index 000000000..129888812
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb
@@ -0,0 +1,117 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Captain::MessageReports', type: :request do
+  let(:account) { create(:account) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:conversation) { create(:conversation, account: account, inbox: inbox) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:message) do
+    create(:message, account: account, conversation: conversation, message_type: :outgoing, sender: assistant)
+  end
+
+  before { create(:inbox_member, user: agent, inbox: inbox) }
+
+  def json_response
+    JSON.parse(response.body, symbolize_names: true)
+  end
+
+  describe 'POST /api/v1/accounts/:account_id/captain/message_reports' do
+    let(:valid_params) do
+      {
+        message_id: message.id,
+        report_reason: 'incorrect_information',
+        description: 'The generated citation is wrong.'
+      }
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/captain/message_reports", params: valid_params, as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when the installation is not on Chatwoot cloud' do
+      before { InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_initialize.update!(value: 'self_hosted') }
+
+      it 'returns not found' do
+        post "/api/v1/accounts/#{account.id}/captain/message_reports",
+             params: valid_params, headers: agent.create_new_auth_token, as: :json
+
+        expect(response).to have_http_status(:not_found)
+      end
+
+      it 'does not create a report' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/message_reports",
+               params: valid_params, headers: agent.create_new_auth_token, as: :json
+        end.not_to change(Captain::MessageReport, :count)
+      end
+    end
+
+    context 'when on Chatwoot cloud' do
+      before { InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_initialize.update!(value: 'cloud') }
+
+      it 'creates a message report for the reporting agent' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/message_reports",
+               params: valid_params, headers: agent.create_new_auth_token, as: :json
+        end.to change(Captain::MessageReport, :count).by(1)
+
+        report = Captain::MessageReport.last
+        aggregate_failures do
+          expect(response).to have_http_status(:success)
+          expect(report.message_id).to eq(message.id)
+          expect(report.conversation_id).to eq(conversation.id)
+          expect(report.user_id).to eq(agent.id)
+          expect(report.report_reason).to eq('incorrect_information')
+          expect(report.description).to eq('The generated citation is wrong.')
+          expect(json_response[:report_reason]).to eq('incorrect_information')
+        end
+      end
+
+      it 'returns not found when the message does not belong to the account' do
+        other_message = create(:message)
+
+        post "/api/v1/accounts/#{account.id}/captain/message_reports",
+             params: valid_params.merge(message_id: other_message.id),
+             headers: agent.create_new_auth_token, as: :json
+
+        expect(response).to have_http_status(:not_found)
+      end
+
+      it 'returns unprocessable entity for an invalid report reason' do
+        post "/api/v1/accounts/#{account.id}/captain/message_reports",
+             params: valid_params.merge(report_reason: 'invalid_reason'),
+             headers: agent.create_new_auth_token, as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'does not allow an agent without access to the conversation to report' do
+        other_agent = create(:user, account: account, role: :agent)
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/message_reports",
+               params: valid_params, headers: other_agent.create_new_auth_token, as: :json
+        end.not_to change(Captain::MessageReport, :count)
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'rejects messages that were not sent by a Captain assistant' do
+        non_captain_message = create(:message, account: account, conversation: conversation)
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/message_reports",
+               params: valid_params.merge(message_id: non_captain_message.id),
+               headers: agent.create_new_auth_token, as: :json
+        end.not_to change(Captain::MessageReport, :count)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
index dbcb7211f..36852c259 100644
--- a/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/companies/contacts_controller_spec.rb
@@ -3,7 +3,10 @@ require 'rails_helper'
 RSpec.describe 'Company contacts API', type: :request do
   let(:account) { create(:account) }
   let(:admin) { create(:user, account: account, role: :administrator) }
-  let(:company) { create(:company, name: 'Acme', account: account) }
+  let(:company) do
+    create(:company, name: 'Acme', domain: 'acme.com', description: 'Primary account', account: account,
+                     custom_attributes: { 'industry' => 'Manufacturing' })
+  end
 
   before { account.enable_features!(:companies) }
 
@@ -19,8 +22,16 @@ RSpec.describe 'Company contacts API', type: :request do
       expect(response).to have_http_status(:success)
       response_body = response.parsed_body
       expect(response_body['payload'].pluck('id')).to eq([linked_contact.id])
-      expect(response_body['payload'].first['company_id']).to eq(company.id)
-      expect(response_body['payload'].first['linked_to_current_company']).to be true
+      contact_payload = response_body['payload'].first
+      expect(contact_payload['company_id']).to eq(company.id)
+      expect(contact_payload['linked_to_current_company']).to be true
+      expect(contact_payload['company']).to include(
+        'id' => company.id,
+        'name' => 'Acme',
+        'domain' => 'acme.com',
+        'description' => 'Primary account',
+        'custom_attributes' => { 'industry' => 'Manufacturing' }
+      )
       expect(response_body['meta']['total_count']).to eq(1)
     end
   end
@@ -38,9 +49,14 @@ RSpec.describe 'Company contacts API', type: :request do
           as: :json
 
       expect(response).to have_http_status(:success)
-      contact_ids = response.parsed_body['payload'].pluck('id')
+      response_payload = response.parsed_body['payload']
+      contact_ids = response_payload.pluck('id')
       expect(contact_ids).to contain_exactly(available_contact.id, assigned_contact.id)
       expect(contact_ids).not_to include(linked_contact.id)
+      expect(response_payload.find { |contact| contact['id'] == assigned_contact.id }['company']).to include(
+        'id' => other_company.id,
+        'name' => 'Other Company'
+      )
     end
   end
 
@@ -56,7 +72,7 @@ RSpec.describe 'Company contacts API', type: :request do
 
       expect(response).to have_http_status(:success)
       expect(contact.reload.company_id).to eq(company.id)
-      expect(contact.additional_attributes).to eq('city' => 'Berlin')
+      expect(contact.additional_attributes).to eq('city' => 'Berlin', 'company_name' => 'Acme')
       expect(response.parsed_body['payload']['company_id']).to eq(company.id)
       expect(response.parsed_body['payload']['linked_to_current_company']).to be true
       expect(company.reload.last_activity_at).to be_within(1.second).of(contact.last_activity_at)
@@ -74,7 +90,7 @@ RSpec.describe 'Company contacts API', type: :request do
 
       expect(response).to have_http_status(:ok)
       expect(contact.reload.company_id).to be_nil
-      expect(contact.additional_attributes).to eq('company_name' => 'Acme', 'city' => 'Berlin')
+      expect(contact.additional_attributes).to eq('city' => 'Berlin')
     end
   end
 end
diff --git a/spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb
new file mode 100644
index 000000000..70d2d4f58
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Contacts API', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+
+  before { account.enable_features!(:companies) }
+
+  describe 'PATCH /api/v1/accounts/{account.id}/contacts/:id' do
+    it 'updates company association' do
+      company = create(:company, account: account, name: 'Acme')
+      contact = create(:contact, account: account)
+
+      patch "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
+            headers: admin.create_new_auth_token,
+            params: { company_id: company.id },
+            as: :json
+
+      expect(response).to have_http_status(:success)
+      expect(contact.reload.company).to eq(company)
+      expect(contact.additional_attributes['company_name']).to eq('Acme')
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts_controller_spec.rb
new file mode 100644
index 000000000..00e50c0e8
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts_controller_spec.rb
@@ -0,0 +1,66 @@
+require 'rails_helper'
+require 'base64'
+
+RSpec.describe 'Enterprise Accounts API', type: :request do
+  describe 'POST /api/v1/accounts' do
+    let(:email) { Faker::Internet.email }
+    let(:user_full_name) { Faker::Name.name_with_middle }
+    let(:first_touch_cookie) { Base64.urlsafe_encode64({ source: 'reddit', source_type: 'paid_social' }.to_json, padding: false) }
+    let(:last_touch_cookie) { Base64.urlsafe_encode64({ source: 'github', source_type: 'referral' }.to_json, padding: false) }
+    let(:attribution_cookie_header) do
+      {
+        'Cookie' => [
+          "#{Internal::Accounts::MarketingAttributionService::FIRST_TOUCH_COOKIE}=#{first_touch_cookie}",
+          "#{Internal::Accounts::MarketingAttributionService::LAST_TOUCH_COOKIE}=#{last_touch_cookie}"
+        ].join('; ')
+      }
+    end
+
+    before do
+      allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
+    end
+
+    it 'records marketing attribution for unauthenticated signup requests' do
+      account_builder = double
+      account = create(:account)
+      user = create(:user, email: email, account: account, name: user_full_name)
+
+      allow(AccountBuilder).to receive(:new).and_return(account_builder)
+      allow(account_builder).to receive(:perform).and_return([user, account])
+
+      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+        post api_v1_accounts_url,
+             params: {
+               account_name: 'test',
+               email: email,
+               user: nil,
+               locale: nil,
+               user_full_name: user_full_name,
+               password: 'Password1!'
+             },
+             headers: attribution_cookie_header,
+             as: :json
+      end
+
+      attribution = account.reload.internal_attributes['marketing_attribution']
+      expect(attribution['captured_from']).to eq('cookie')
+      expect(attribution['first_touch']).to include('source' => 'reddit', 'source_type' => 'paid_social')
+      expect(attribution['last_touch']).to include('source' => 'github', 'source_type' => 'referral')
+    end
+
+    it 'does not record marketing attribution for authenticated add-workspace requests' do
+      existing_user = create(:user, password: 'Password1!')
+
+      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+        post api_v1_accounts_url,
+             params: { account_name: 'Second Account', email: existing_user.email,
+                       user_full_name: existing_user.name, password: 'Password1!' },
+             headers: existing_user.create_new_auth_token.merge(attribution_cookie_header),
+             as: :json
+      end
+
+      account = Account.find(response.parsed_body.dig('data', 'account_id'))
+      expect(account.internal_attributes).not_to include('marketing_attribution')
+    end
+  end
+end
diff --git a/spec/enterprise/models/captain/message_report_spec.rb b/spec/enterprise/models/captain/message_report_spec.rb
new file mode 100644
index 000000000..ded42890c
--- /dev/null
+++ b/spec/enterprise/models/captain/message_report_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+RSpec.describe Captain::MessageReport, type: :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:account) }
+    it { is_expected.to belong_to(:conversation) }
+    it { is_expected.to belong_to(:message) }
+    it { is_expected.to belong_to(:user) }
+
+    it 'resolves the conversation association to the top-level Conversation model' do
+      # `Captain::Conversation` exists as a job namespace, so without an explicit
+      # class_name the association would resolve to that module instead.
+      expect(described_class.reflect_on_association(:conversation).klass).to eq(Conversation)
+    end
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:report_reason) }
+    it { is_expected.to validate_inclusion_of(:report_reason).in_array(described_class::REPORT_REASONS) }
+  end
+
+  describe 'callbacks' do
+    let(:account) { create(:account) }
+    let(:conversation) { create(:conversation, account: account) }
+    let(:message) { create(:message, account: account, conversation: conversation) }
+
+    it 'derives the account and conversation from the message' do
+      report = described_class.create!(message: message, user: create(:user, account: account), report_reason: 'other')
+
+      expect(report.account).to eq(account)
+      expect(report.conversation).to eq(conversation)
+    end
+  end
+
+  describe 'factory' do
+    it 'creates a valid message report' do
+      expect(build(:captain_message_report)).to be_valid
+    end
+  end
+end
diff --git a/spec/enterprise/models/contact_company_association_spec.rb b/spec/enterprise/models/contact_company_association_spec.rb
index 709893a40..6ed8af4f6 100644
--- a/spec/enterprise/models/contact_company_association_spec.rb
+++ b/spec/enterprise/models/contact_company_association_spec.rb
@@ -67,4 +67,20 @@ RSpec.describe Contact, type: :model do
       end
     end
   end
+
+  describe '#push_event_data' do
+    let(:account) { create(:account) }
+    let(:company) { create(:company, account: account) }
+    let(:contact) { create(:contact, account: account, company: company) }
+
+    it 'includes company_id when companies feature is enabled' do
+      account.enable_features!(:companies)
+
+      expect(contact.push_event_data[:company_id]).to eq(company.id)
+    end
+
+    it 'does not include company_id when companies feature is disabled' do
+      expect(contact.push_event_data).not_to have_key(:company_id)
+    end
+  end
 end
diff --git a/spec/enterprise/services/contacts/company_association_service_spec.rb b/spec/enterprise/services/contacts/company_association_service_spec.rb
index 78ee739c8..c8c6f6525 100644
--- a/spec/enterprise/services/contacts/company_association_service_spec.rb
+++ b/spec/enterprise/services/contacts/company_association_service_spec.rb
@@ -25,6 +25,7 @@ RSpec.describe Contacts::CompanyAssociationService, type: :service do
         expect(contact.company).to be_present
         expect(contact.company.domain).to eq('acme.com')
         expect(contact.company.name).to eq('Acme')
+        expect(contact.additional_attributes['company_name']).to eq('Acme')
       end
 
       it 'reuses existing company with same domain' do
diff --git a/spec/enterprise/services/internal/accounts/marketing_attribution_service_spec.rb b/spec/enterprise/services/internal/accounts/marketing_attribution_service_spec.rb
new file mode 100644
index 000000000..0046908dc
--- /dev/null
+++ b/spec/enterprise/services/internal/accounts/marketing_attribution_service_spec.rb
@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'base64'
+
+RSpec.describe Internal::Accounts::MarketingAttributionService do
+  let(:account) { create(:account) }
+  let(:cookies) { {} }
+
+  before do
+    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(true)
+  end
+
+  it 'stores website attribution cookies on the account' do
+    cookies[described_class::FIRST_TOUCH_COOKIE] = encoded_cookie(
+      'source' => 'reddit',
+      'source_type' => 'paid_social',
+      'referrer' => 'https://reddit.com',
+      'referrer_path' => '/r/selfhosted/comments/123/chatwoot'
+    )
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie(
+      'source' => 'github',
+      'source_type' => 'referral'
+    )
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['captured_from']).to eq('cookie')
+    expect(attribution['first_touch']['source']).to eq('reddit')
+    expect(attribution['first_touch']['referrer_path']).to eq('/r/selfhosted/comments/123/chatwoot')
+    expect(attribution['last_touch']['source']).to eq('github')
+  end
+
+  it 'does not store attribution outside Chatwoot Cloud' do
+    allow(ChatwootApp).to receive(:chatwoot_cloud?).and_return(false)
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie('source' => 'reddit')
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    expect(account.reload.internal_attributes).not_to include('marketing_attribution')
+  end
+
+  it 'decodes base64url cookie values and preserves plus signs' do
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie(
+      'source' => 'google',
+      'utm_campaign' => 'C++ launch'
+    )
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['last_touch']['utm_campaign']).to eq('C++ launch')
+  end
+
+  it 'preserves an existing touch when the matching cookie is absent' do
+    account.update!(
+      internal_attributes: {
+        'marketing_attribution' => {
+          'first_touch' => { 'source' => 'reddit' },
+          'last_touch' => { 'source' => 'github' }
+        }
+      }
+    )
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie('source' => 'google')
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['first_touch']['source']).to eq('reddit')
+    expect(attribution['last_touch']['source']).to eq('google')
+  end
+
+  it 'preserves other internal attributes' do
+    account.update!(internal_attributes: { 'manually_managed_features' => ['inbound_emails'] })
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie('source' => 'google')
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    expect(account.reload.internal_attributes['manually_managed_features']).to eq(['inbound_emails'])
+  end
+
+  it 'ignores parsed cookies that are not populated attribution objects' do
+    account.update!(
+      internal_attributes: {
+        'marketing_attribution' => {
+          'first_touch' => { 'source' => 'reddit' },
+          'last_touch' => { 'source' => 'github' }
+        }
+      }
+    )
+    cookies[described_class::FIRST_TOUCH_COOKIE] = {}.to_json
+    cookies[described_class::LAST_TOUCH_COOKIE] = [].to_json
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['first_touch']['source']).to eq('reddit')
+    expect(attribution['last_touch']['source']).to eq('github')
+  end
+
+  it 'stores only allowlisted scalar attribution fields' do
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie(
+      'source' => 'google',
+      'source_type' => 'paid_search',
+      'utm_campaign' => 'spring',
+      'unknown_field' => 'ignore me',
+      'nested' => { 'value' => 'ignore me' },
+      'array' => ['ignore me']
+    )
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['last_touch']).to eq(
+      'source' => 'google',
+      'source_type' => 'paid_search',
+      'utm_campaign' => 'spring'
+    )
+  end
+
+  it 'truncates oversized attribution values' do
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie(
+      'source' => 'google',
+      'utm_campaign' => 'a' * 600
+    )
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['last_touch']['utm_campaign'].length).to eq(described_class::FIELD_MAX_LENGTH)
+  end
+
+  it 'stores raw attribution values without escaping them' do
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie(
+      'source' => '<script>alert(1)</script>',
+      'utm_campaign' => 'launch & learn'
+    )
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['last_touch']['source']).to eq('<script>alert(1)</script>')
+    expect(attribution['last_touch']['utm_campaign']).to eq('launch & learn')
+  end
+
+  it 'caps raw attribution values' do
+    cookies[described_class::LAST_TOUCH_COOKIE] = encoded_cookie(
+      'source' => 'google',
+      'utm_campaign' => '&' * 600
+    )
+
+    described_class.new(account: account, cookies: cookies).perform
+
+    attribution = account.reload.internal_attributes['marketing_attribution']
+    expect(attribution['last_touch']['utm_campaign'].length).to eq(described_class::FIELD_MAX_LENGTH)
+  end
+
+  def encoded_cookie(payload)
+    Base64.urlsafe_encode64(payload.to_json, padding: false)
+  end
+end
diff --git a/spec/factories/captain/message_report.rb b/spec/factories/captain/message_report.rb
new file mode 100644
index 000000000..d7f1cfca0
--- /dev/null
+++ b/spec/factories/captain/message_report.rb
@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :captain_message_report, class: 'Captain::MessageReport' do
+    report_reason { 'incorrect_information' }
+    description { 'The generated citation is wrong.' }
+    association :message
+    association :user
+  end
+end
diff --git a/spec/jobs/slack_unfurl_job_spec.rb b/spec/jobs/slack_unfurl_job_spec.rb
index b9be64461..f40efc41d 100644
--- a/spec/jobs/slack_unfurl_job_spec.rb
+++ b/spec/jobs/slack_unfurl_job_spec.rb
@@ -74,8 +74,10 @@ RSpec.describe SlackUnfurlJob do
     end
 
     context 'when another account URL is shared' do
+      let(:another_account) { create(:account) }
+
       before do
-        link_shared[:event][:links][0][:url] = 'https://qa.chatwoot.com/app/accounts/123/conversations/123'
+        link_shared[:event][:links][0][:url] = "https://qa.chatwoot.com/app/accounts/#{another_account.id}/conversations/123"
       end
 
       it 'does not unfurl' do
diff --git a/spec/lib/active_storage/migrator_spec.rb b/spec/lib/active_storage/migrator_spec.rb
new file mode 100644
index 000000000..748e18174
--- /dev/null
+++ b/spec/lib/active_storage/migrator_spec.rb
@@ -0,0 +1,175 @@
+require 'rails_helper'
+require 'fileutils'
+require 'stringio'
+require 'tmpdir'
+
+RSpec.describe ActiveStorage::Migrator do
+  around do |example|
+    original_services = ActiveStorage::Blob.services
+    original_service = ActiveStorage::Blob.service
+
+    example.run
+  ensure
+    ActiveStorage::Blob.services = original_services
+    ActiveStorage::Blob.service = original_service
+  end
+
+  describe '.migrate' do
+    let(:from_service_stub) { instance_double(ActiveStorage::Service, name: 'local') }
+    let(:to_service_stub) { instance_double(ActiveStorage::Service, name: 'amazon') }
+
+    before do
+      allow(ActiveStorage::Service).to receive(:configure).with('local', any_args).and_return(from_service_stub)
+      allow(ActiveStorage::Service).to receive(:configure).with('amazon', any_args).and_return(to_service_stub)
+    end
+
+    context 'when services are configured correctly' do
+      it 'migrates blobs from one service to another' do
+        expect(ActiveStorage::Service).to receive(:configure).with('local', any_args)
+        expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: true)
+        expect { described_class.migrate('local', 'amazon') }.not_to raise_error
+      end
+
+      it 'passes the service-name update flag to blob migration' do
+        expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: false)
+
+        described_class.migrate('local', 'amazon', should_update_service_name: false)
+      end
+
+      it 'does not override the application logger' do
+        allow(described_class).to receive(:migrate_blobs)
+
+        expect(Rails).not_to receive(:logger=)
+
+        described_class.migrate('local', 'amazon')
+      end
+    end
+
+    context 'when services are not configured correctly' do
+      it 'prints an error message' do
+        allow(ActiveStorage::Service).to receive(:configure).and_return(nil)
+        expect do
+          described_class.migrate('random', 'random')
+        end.to raise_error(RuntimeError, "Error: The services 'random' or 'random' are not configured correctly.")
+      end
+    end
+  end
+
+  describe '.migrate_blobs' do
+    let(:from_root) { Dir.mktmpdir('active-storage-local') }
+    let(:to_root) { Dir.mktmpdir('active-storage-amazon') }
+    let(:other_root) { Dir.mktmpdir('active-storage-other') }
+    let(:from_service) { build_disk_service('local', from_root) }
+    let(:to_service) { build_disk_service('amazon', to_root) }
+    let(:other_service) { build_disk_service('other', other_root) }
+
+    before do
+      allow(described_class).to receive(:configure_service).with(:amazon).and_return(to_service)
+    end
+
+    around do |example|
+      original_services = ActiveStorage::Blob.services
+      original_service = ActiveStorage::Blob.service
+
+      ActiveStorage::Blob.services = {
+        'local' => from_service,
+        'amazon' => to_service,
+        'other' => other_service
+      }
+      ActiveStorage::Blob.service = from_service
+
+      example.run
+    ensure
+      ActiveStorage::Blob.services = original_services
+      ActiveStorage::Blob.service = original_service
+      FileUtils.rm_rf([from_root, to_root, other_root])
+    end
+
+    it 'uploads non-image blobs and updates their service name' do
+      blob = create_blob(service_name: 'local', filename: 'invoice.pdf', content_type: 'application/pdf', content: 'pdf-content')
+
+      described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+      expect(blob).not_to be_image
+      expect(blob.reload.service_name).to eq('amazon')
+      expect(to_service.download(blob.key)).to eq('pdf-content')
+    end
+
+    it 'only migrates blobs from the source service' do
+      local_blob = create_blob(service_name: 'local', filename: 'audio.mp3', content_type: 'audio/mpeg', content: 'audio-content')
+      other_blob = create_blob(service_name: 'other', filename: 'other.pdf', content_type: 'application/pdf', content: 'other-content')
+
+      described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+      expect(local_blob.reload.service_name).to eq('amazon')
+      expect(to_service.download(local_blob.key)).to eq('audio-content')
+      expect(other_blob.reload.service_name).to eq('other')
+      expect(to_service.exist?(other_blob.key)).to be(false)
+      expect(other_service.download(other_blob.key)).to eq('other-content')
+    end
+
+    it 'skips missing source files and continues migration' do
+      missing_blob = create_blob(service_name: 'local', filename: 'missing.pdf', content_type: 'application/pdf', content: 'missing-content')
+      existing_blob = create_blob(service_name: 'local', filename: 'existing.pdf', content_type: 'application/pdf', content: 'existing-content')
+
+      from_service.delete(missing_blob.key)
+
+      expect do
+        described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+      end.not_to raise_error
+
+      expect(missing_blob.reload.service_name).to eq('local')
+      expect(to_service.exist?(missing_blob.key)).to be(false)
+      expect(existing_blob.reload.service_name).to eq('amazon')
+      expect(to_service.download(existing_blob.key)).to eq('existing-content')
+    end
+
+    it 'does not update the blob service when upload fails' do
+      blob = create_blob(service_name: 'local', filename: 'report.pdf', content_type: 'application/pdf', content: 'report-content')
+
+      allow(to_service).to receive(:upload).and_raise(ActiveStorage::IntegrityError)
+
+      expect do
+        described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+      end.to raise_error(ActiveStorage::IntegrityError)
+
+      expect(blob.reload.service_name).to eq('local')
+      expect(to_service.exist?(blob.key)).to be(false)
+    end
+
+    it 'skips the blob service update when the flag is disabled' do
+      blob = create_blob(service_name: 'local', filename: 'manual.pdf', content_type: 'application/pdf', content: 'manual-content')
+
+      described_class.migrate_blobs(:local, :amazon, should_update_service_name: false)
+
+      expect(blob.reload.service_name).to eq('local')
+      expect(to_service.download(blob.key)).to eq('manual-content')
+    end
+
+    it 'does not rewrite blobs that were already migrated' do
+      blob = create_blob(service_name: 'local', filename: 'archive.pdf', content_type: 'application/pdf', content: 'archive-content')
+
+      allow(to_service).to receive(:upload).and_call_original
+
+      2.times { described_class.migrate_blobs(:local, :amazon, should_update_service_name: true) }
+
+      expect(to_service).to have_received(:upload).with(blob.key, an_instance_of(Tempfile), checksum: blob.checksum).once
+      expect(blob.reload.service_name).to eq('amazon')
+      expect(ActiveStorage::Blob.where(id: blob.id, service_name: 'local')).to be_empty
+    end
+
+    def build_disk_service(service_name, root)
+      ActiveStorage::Service.configure(service_name, { service_name => { service: 'Disk', root: root } })
+    end
+
+    def create_blob(service_name:, filename:, content_type:, content:)
+      ActiveStorage::Blob.create_and_upload!(
+        io: StringIO.new(content),
+        filename: filename,
+        content_type: content_type,
+        service_name: service_name,
+        identify: false
+      )
+    end
+  end
+end
diff --git a/spec/lib/tasks/rake/task_storage_migrations_spec.rb b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
new file mode 100644
index 000000000..552c814b3
--- /dev/null
+++ b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
@@ -0,0 +1,64 @@
+require 'rake'
+require 'rails_helper'
+
+RSpec.describe Rake::Task do
+  describe 'storage_migrations' do
+    describe 'rake task' do
+      subject(:task) { described_class['storage:migrate'] }
+
+      before do
+        task.reenable
+      end
+
+      context 'when FROM argument is missing' do
+        it 'raises an error' do
+          with_modified_env FROM: nil, TO: 'amazon' do
+            expect do
+              task.invoke
+            end.to raise_error(RuntimeError,
+                               'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+          end
+        end
+      end
+
+      context 'when TO argument is missing' do
+        it 'raises an error' do
+          with_modified_env FROM: 'service_name', TO: nil do
+            expect do
+              task.invoke
+            end.to raise_error(RuntimeError,
+                               'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+          end
+        end
+      end
+
+      context 'when required arguments are present' do
+        it 'updates blob service names by default' do
+          expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: true)
+
+          with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+            task.invoke
+          end
+        end
+
+        it 'skips updating blob service names when disabled' do
+          expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: false)
+
+          with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: 'false' do
+            task.invoke
+          end
+        end
+
+        it 'can be invoked again after the task is re-enabled' do
+          expect(ActiveStorage::Migrator).to receive(:migrate).twice.with(:local, :amazon, should_update_service_name: true)
+
+          with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+            task.invoke
+            task.reenable
+            task.invoke
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e83db4046..984cd045f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -7,6 +7,10 @@ require 'rspec/rails'
 require 'pundit/rspec'
 require 'sidekiq/testing'
 
+# Load Rake tasks
+require 'rake'
+Rails.application.load_tasks
+
 # test-prof helpers for tests optimization
 require 'test_prof/recipes/rspec/before_all'
 require 'test_prof/recipes/rspec/let_it_be'
diff --git a/spec/services/user_session_tracking_service_spec.rb b/spec/services/user_session_tracking_service_spec.rb
index 71b6d5924..2b98b95bf 100644
--- a/spec/services/user_session_tracking_service_spec.rb
+++ b/spec/services/user_session_tracking_service_spec.rb
@@ -47,6 +47,75 @@ RSpec.describe UserSessionTrackingService do
       expect(existing.reload.ip_address).to eq('8.8.8.8')
       expect(existing.last_activity_at).to be_within(1.second).of(Time.current)
     end
+
+    context 'with a Chatwoot Mobile legacy User-Agent' do
+      let(:request) do
+        instance_double(
+          ActionDispatch::Request,
+          user_agent: ua,
+          remote_ip: '8.8.8.8'
+        )
+      end
+
+      context 'when the UA is okhttp (Android Chatwoot Mobile)' do
+        let(:ua) { 'okhttp/4.9.2' }
+
+        it 'labels the session as Chatwoot Mobile on Android', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Chatwoot Mobile')
+          expect(session.browser_version).to be_nil
+          expect(session.platform_name).to eq('Android')
+          expect(session.platform_version).to be_nil
+          expect(session.device_name).to eq('Android')
+          expect(session.user_agent).to eq(ua)
+        end
+      end
+
+      context 'when the UA is CFNetwork (iOS Chatwoot Mobile)' do
+        let(:ua) { 'Chatwoot/3759 CFNetwork/3886.100.1 Darwin/27.0.0' }
+
+        it 'labels the session as Chatwoot Mobile on iPhone', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Chatwoot Mobile')
+          expect(session.browser_version).to be_nil
+          expect(session.platform_name).to eq('iPhone')
+          expect(session.platform_version).to be_nil
+          expect(session.device_name).to eq('iPhone')
+          expect(session.user_agent).to eq(ua)
+        end
+      end
+
+      context 'when the UA is a real browser (Firefox on Linux)' do
+        let(:ua) { 'Mozilla/5.0 (X11; Linux x86_64; rv:124.0) Gecko/20100101 Firefox/124.0' }
+
+        it 'does not override the Browser-derived metadata', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Firefox')
+          expect(session.platform_name).to eq('Generic Linux')
+          expect(session.device_name).not_to eq('Android')
+          expect(session.device_name).not_to eq('iPhone')
+        end
+      end
+
+      context 'when the UA is unknown but does not match any mobile pattern' do
+        let(:ua) { 'curl/8.4.0' }
+
+        it 'leaves the Unknown labels untouched', :aggregate_failures do
+          service.create_or_update!
+
+          session = user.user_sessions.last
+          expect(session.browser_name).to eq('Unknown Browser')
+          expect(session.platform_name).to eq('Unknown')
+          expect(session.device_name).to eq('Unknown')
+        end
+      end
+    end
   end
 
   describe '#update_activity!' do
diff --git a/theme/colors.js b/theme/colors.js
index 0f4d2af10..9dcfbeb8c 100644
--- a/theme/colors.js
+++ b/theme/colors.js
@@ -258,6 +258,11 @@ export const colors = {
       black2: 'rgba(var(--black-alpha-2))',
       white: 'rgba(var(--white-alpha))',
     },
+    // Voice call widget
+    'call-widget': 'rgba(var(--call-widget))',
+    'call-widget-border': 'rgba(var(--call-widget-border))',
+    'call-widget-text': 'rgba(var(--call-widget-text))',
+    'call-widget-sub-text': 'rgba(var(--call-widget-sub-text))',
     // Border colors
     weak: 'rgb(var(--border-weak) / <alpha-value>)',
     container: 'rgba(var(--border-container))',