diff --git a/02.deploy_pulsarCluster.yaml b/02.deploy_pulsarCluster.yaml
index 4fb276f..e3191e1 100755
--- a/02.deploy_pulsarCluster.yaml
+++ b/02.deploy_pulsarCluster.yaml
@@ -37,6 +37,12 @@
     # - "keep_newer_files: yes" means not to overwrite existing Pulsar files
     - { role: pulsar/common/pulsar_instBinary, keep_newer_files: yes, when: deploy_status=="add" }
 
+
+## 
+# This step is not needed when DS LS release option is base or all.
+# - pulsarLS_bin_opt: "" or "all"
+# This step is needed when DS LS release option is core
+# - pulsarLS_bin_opt: "core"
 - hosts: broker
   any_errors_fatal: true
   become: "{{ sudo_needed }}"
@@ -45,7 +51,8 @@
     - name: Copy the nar file needed for broker side message filtering
       include_role:
         name: pulsar/broker/_deploy_msg_filter_package
-      when: deploy_status=="add" and enable_srvside_msg_filtering|bool
+      when: deploy_status=="add" and enable_srvside_msg_filtering|bool and 
+            pulsarLS_bin_opt=="core"
 
 
 #########################
diff --git a/group_vars/all b/group_vars/all
index f701f8a..3f9e52b 100755
--- a/group_vars/all
+++ b/group_vars/all
@@ -36,10 +36,8 @@ install_jdk: false
 openjdk_ver: 11
 
 # - DataStax LunaStreaming release
-# pulsarLS_ver_main: "2.8.3"
-# pulsarLS_ver_secondary: "1.0.14"
 pulsarLS_ver_main: "2.10"
-pulsarLS_ver_secondary: "1.5"
+pulsarLS_ver_secondary: "1.7"
 pulsarLS_ver_signifant: "{{ pulsarLS_ver_main.split('.')[0] }}.{{ pulsarLS_ver_main.split('.')[1] }}"
 pulsarLS_ver: "{{ pulsarLS_ver_main }}.{{ pulsarLS_ver_secondary }}"
 # valid luna streaming binary options: "core" (Pulsar core), "" (base), "all (including all packages, I/O conenctors and message filters)"
diff --git a/group_vars/broker/all b/group_vars/broker/all
index c6ad755..7b76f79 100644
--- a/group_vars/broker/all
+++ b/group_vars/broker/all
@@ -41,7 +41,7 @@ enable_transaction: true
 enable_srvside_msg_filtering: true
 tgt_msg_filter_package_dir: "{{ tgt_pulsar_inst_dir }}/filters"
 
-msg_filter_package_version: 2.4.3
+msg_filter_package_version: 2.4.11
 msg_filter_package_name: "pulsar-jms-{{ msg_filter_package_version }}-nar.nar"
 
 msg_filter_pkg_download_url_base: "https://github.com/datastax/pulsar-jms/releases/download"
diff --git a/roles/pulsar/common/pulsar_chkCurVer/tasks/main.yaml b/roles/pulsar/common/pulsar_chkCurVer/tasks/main.yaml
index b2493b8..f7ff0f2 100644
--- a/roles/pulsar/common/pulsar_chkCurVer/tasks/main.yaml
+++ b/roles/pulsar/common/pulsar_chkCurVer/tasks/main.yaml
@@ -1,7 +1,6 @@
 ---
 - name: Check the existing Pulsar version
-  shell: |
-    {% if sudo_needed|bool %}sudo -u {{ pulsar_user }} {% endif %}{{ tgt_pulsar_inst_dir }}/bin/pulsar version
+  shell: "{% if sudo_needed|bool %}sudo -u {{ pulsar_user }} {% endif %}{{ common_jvm_settings|trim|replace('\n',' ') }} {{ tgt_pulsar_inst_dir }}/bin/pulsar version"
   register: pulsar_ver_output
 
 - name: Set existing Pulsar version in a variable  
diff --git a/roles/pulsar/common/pulsar_resetBinaryNoData/tasks/main.yaml b/roles/pulsar/common/pulsar_resetBinaryNoData/tasks/main.yaml
index 62d9517..6cddce9 100755
--- a/roles/pulsar/common/pulsar_resetBinaryNoData/tasks/main.yaml
+++ b/roles/pulsar/common/pulsar_resetBinaryNoData/tasks/main.yaml
@@ -1,4 +1,12 @@
 ---
+- name: Make sure Pulsar binary files (including subfolders) are under the correct ownership
+  file:
+    path: "{{ tgt_pulsar_inst_dir }}"
+    state: directory
+    owner: "{{ pulsar_user }}"
+    group: "{{ pulsar_user_group }}"
+    recurse: yes
+
 - name: Delete all Pulsar binary files (including subfolders), but excluding data subdirectory if so
   shell: |
     cd {{ tgt_pulsar_inst_dir }} 
diff --git a/update_pulsarCluster_version.yaml b/update_pulsarCluster_version.yaml
index dbbb448..4fe282c 100644
--- a/update_pulsarCluster_version.yaml
+++ b/update_pulsarCluster_version.yaml
@@ -232,7 +232,7 @@
               (update_component is not defined or update_component==srv_component) }
     # Copy the nar file needed for broker side message filtering
     - { role: pulsar/broker/_deploy_msg_filter_package, 
-        when: enable_srvside_msg_filtering|bool and
+        when: enable_srvside_msg_filtering|bool and pulsarLS_bin_opt=="core" and
               (update_component is not defined or update_component==srv_component) }
     # Set up the configuration files of the target Pulsar version
     - { role: pulsar/broker/brkr_config,