diff --git a/suites/pacific/rgw/tier-4-rgw.yaml b/suites/pacific/rgw/tier-4-rgw.yaml
index dd80bc56d..017ac9a75 100644
--- a/suites/pacific/rgw/tier-4-rgw.yaml
+++ b/suites/pacific/rgw/tier-4-rgw.yaml
@@ -218,3 +218,14 @@ tests:
       config:
         script-name: test_swift_basic_ops.py
         config-file-name: test_s3_and_swift_versioning.yaml
+
+  # test MOD hotfix bz: complete and abort multipart upload race causes obj download failure after gc kicks in
+
+  - test:
+      name: test MOD hotfix bz - 404 again
+      desc: complete and abort multipart upload race causes obj download failure after gc kicks in
+      polarion-id: CEPH-83604471
+      module: sanity_rgw.py
+      config:
+        script-name: test_Mbuckets_with_Nobjects.py
+        config-file-name: test_Mbuckets_with_Nobjects_multipart_upload_complete_abort_race.yaml
diff --git a/suites/reef/rgw/tier-4-rgw.yaml b/suites/reef/rgw/tier-4-rgw.yaml
index a42243abb..a8a81954f 100644
--- a/suites/reef/rgw/tier-4-rgw.yaml
+++ b/suites/reef/rgw/tier-4-rgw.yaml
@@ -1,262 +1,273 @@
 # This suite executes Tier 4 RGW tests
 
 tests:
-  - test:
-      abort-on-fail: true
-      desc: Install software pre-requisites for cluster deployment.
-      module: install_prereq.py
-      name: setup pre-requisites
-  - test:
-      abort-on-fail: true
-      config:
-        verify_cluster_health: true
-        steps:
-          - config:
-              command: bootstrap
-              service: cephadm
-              args:
-                registry-url: registry.redhat.io
-                mon-ip: node1
-                orphan-initial-daemons: true
-                skip-monitoring-stack: true
-                initial-dashboard-password: admin@123
-                dashboard-password-noupdate: true
-          - config:
-              command: add_hosts
-              service: host
-              args:
-                attach_ip_address: true
-                labels: apply-all-labels
-          - config:
-              command: apply
-              service: mgr
-              args:
-                placement:
-                  label: mgr
-          - config:
-              command: apply
-              service: mon
-              args:
-                placement:
-                  label: mon
-          - config:
-              command: apply
-              service: osd
-              args:
-                all-available-devices: true
-          - config:
-              command: apply
-              service: rgw
-              pos_args:
-                - rgw.1
-              args:
-                placement:
-                  label: rgw
-      desc: RHCS cluster deployment using cephadm.
-      destroy-cluster: false
-      module: test_cephadm.py
-      name: deploy cluster
-      polarion-id: CEPH-83573777
-
-  - test:
-      name: Monitoring Services deployment
-      desc: Add monitoring services using spec file.
-      module: test_cephadm.py
-      polarion-id: CEPH-83574727
-      config:
-        steps:
-          - config:
-              command: apply_spec
-              service: orch
-              validate-spec-services: true
-              specs:
-                - service_type: prometheus
-                  placement:
-                    count: 1
-                    nodes:
-                      - node1
-                - service_type: grafana
-                  placement:
-                    nodes:
-                      - node1
-                - service_type: alertmanager
-                  placement:
-                    count: 1
-                - service_type: node-exporter
-                  placement:
-                    host_pattern: "*"
-                - service_type: crash
-                  placement:
-                    host_pattern: "*"
-
-  # Bucket policy tests
-
-  - test:
-      name: test bucket policy with invalid action
-      desc: test bucket policy with invalid action
-      polarion-id: CEPH-83572755
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_policy_ops.py
-        config-file-name: test_bucket_policy_invalid_action.yaml
-
-  - test:
-      name: test bucket policy with invalid conditional in condition blocks
-      desc: test bucket policy with invalid conditional in condition blocks
-      polarion-id: CEPH-83572755
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_policy_ops.py
-        config-file-name: test_bucket_policy_invalid_condition_key.yaml
-
-  - test:
-      name: test bucket policy with invalid effect
-      desc: test bucket policy with invalid effect
-      polarion-id: CEPH-83572755
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_policy_ops.py
-        config-file-name: test_bucket_policy_invalid_effect.yaml
+#  - test:
+#      abort-on-fail: true
+#      desc: Install software pre-requisites for cluster deployment.
+#      module: install_prereq.py
+#      name: setup pre-requisites
+#  - test:
+#      abort-on-fail: true
+#      config:
+#        verify_cluster_health: true
+#        steps:
+#          - config:
+#              command: bootstrap
+#              service: cephadm
+#              args:
+#                registry-url: registry.redhat.io
+#                mon-ip: node1
+#                orphan-initial-daemons: true
+#                skip-monitoring-stack: true
+#                initial-dashboard-password: admin@123
+#                dashboard-password-noupdate: true
+#          - config:
+#              command: add_hosts
+#              service: host
+#              args:
+#                attach_ip_address: true
+#                labels: apply-all-labels
+#          - config:
+#              command: apply
+#              service: mgr
+#              args:
+#                placement:
+#                  label: mgr
+#          - config:
+#              command: apply
+#              service: mon
+#              args:
+#                placement:
+#                  label: mon
+#          - config:
+#              command: apply
+#              service: osd
+#              args:
+#                all-available-devices: true
+#          - config:
+#              command: apply
+#              service: rgw
+#              pos_args:
+#                - rgw.1
+#              args:
+#                placement:
+#                  label: rgw
+#      desc: RHCS cluster deployment using cephadm.
+#      destroy-cluster: false
+#      module: test_cephadm.py
+#      name: deploy cluster
+#      polarion-id: CEPH-83573777
+#
+#  - test:
+#      name: Monitoring Services deployment
+#      desc: Add monitoring services using spec file.
+#      module: test_cephadm.py
+#      polarion-id: CEPH-83574727
+#      config:
+#        steps:
+#          - config:
+#              command: apply_spec
+#              service: orch
+#              validate-spec-services: true
+#              specs:
+#                - service_type: prometheus
+#                  placement:
+#                    count: 1
+#                    nodes:
+#                      - node1
+#                - service_type: grafana
+#                  placement:
+#                    nodes:
+#                      - node1
+#                - service_type: alertmanager
+#                  placement:
+#                    count: 1
+#                - service_type: node-exporter
+#                  placement:
+#                    host_pattern: "*"
+#                - service_type: crash
+#                  placement:
+#                    host_pattern: "*"
+#
+#  # Bucket policy tests
+#
+#  - test:
+#      name: test bucket policy with invalid action
+#      desc: test bucket policy with invalid action
+#      polarion-id: CEPH-83572755
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_policy_ops.py
+#        config-file-name: test_bucket_policy_invalid_action.yaml
+#
+#  - test:
+#      name: test bucket policy with invalid conditional in condition blocks
+#      desc: test bucket policy with invalid conditional in condition blocks
+#      polarion-id: CEPH-83572755
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_policy_ops.py
+#        config-file-name: test_bucket_policy_invalid_condition_key.yaml
+#
+#  - test:
+#      name: test bucket policy with invalid effect
+#      desc: test bucket policy with invalid effect
+#      polarion-id: CEPH-83572755
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_policy_ops.py
+#        config-file-name: test_bucket_policy_invalid_effect.yaml
+#
+#  - test:
+#      name: test bucket policy with invalid key
+#      desc: test bucket policy with invalid key
+#      polarion-id: CEPH-83572755
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_policy_ops.py
+#        config-file-name: test_bucket_policy_invalid_key.yaml
+#
+#  - test:
+#      name: test bucket policy with invalid principal
+#      desc: test bucket policy with invalid principal
+#      polarion-id: CEPH-83572755
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_policy_ops.py
+#        config-file-name: test_bucket_policy_invalid_principal.yaml
+#
+#  - test:
+#      name: test bucket policy with invalid resource
+#      desc: test bucket policy with invalid resource
+#      polarion-id: CEPH-83572755
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_policy_ops.py
+#        config-file-name: test_bucket_policy_invalid_resource.yaml
+#
+#  - test:
+#      name: test bucket policy with invalid version
+#      desc: test bucket policy with invalid version
+#      polarion-id: CEPH-83572755
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_policy_ops.py
+#        config-file-name: test_bucket_policy_invalid_version.yaml
+#
+#  # Bucket lifecycle tests
+#
+#  - test:
+#      name: test bucket lc rule conflict between expiration and transition
+#      desc: test bucket lc rule conflict between expiration and transition
+#      polarion-id: CEPH-11184
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_lifecycle_object_expiration_transition.py
+#        config-file-name: test_lc_rule_conflict_btw_exp_transition.yaml
+#
+#  - test:
+#      name: test bucket lc rule conflict between expiration days
+#      desc: test bucket lc rule conflict between expiration days
+#      polarion-id: CEPH-11184
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_lifecycle_object_expiration_transition.py
+#        config-file-name: test_lc_rule_conflict_exp_days.yaml
+#
+#  - test:
+#      name: test bucket lc rule conflict between transition actions
+#      desc: test bucket lc rule conflict between transition actions
+#      polarion-id: CEPH-11184
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_lifecycle_object_expiration_transition.py
+#        config-file-name: test_lc_rule_conflict_transition_actions.yaml
+#
+#  - test:
+#      name: test bucket lc rules with same ruleid but different rules
+#      desc: test bucket lc rules with same ruleid but different rules
+#      polarion-id: CEPH-11183
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_lifecycle_object_expiration_transition.py
+#        config-file-name: test_lc_rule_same_rule_id_diff_rules.yaml
+#
+#  - test:
+#      name: Test bucket lc reverse transition
+#      desc: Test bucket lc reverse transition
+#      polarion-id: CEPH-83573373
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_bucket_lifecycle_object_expiration_transition.py
+#        config-file-name: test_lc_rule_reverse_transition.yaml
+#
+#  # swift container operation
+#  - test:
+#      name: swift enabling versioning on a bucket that is S3 versioned
+#      desc: test swift enabling versioning on a bucket that is S3 versioned
+#      polarion-id: CEPH-10649
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_swift_basic_ops.py
+#        config-file-name: test_s3_and_swift_versioning.yaml
+#
+#  # test s3-select with query generation of incorrect syntax
+#
+#  - test:
+#      abort-on-fail: true
+#      config:
+#        role: client
+#        sudo: True
+#        commands:
+#          - "echo '\n\n# increase limit on number of open files\n*               soft    nofile          16384\n*               hard    nofile          16384' >> /etc/security/limits.conf"
+#          - "echo 'ulimit -n 16384' >> /etc/profile"
+#      desc: increase ulimit number of open files to 16384
+#      module: exec.py
+#      name: increase ulimit number of open files to 16384
+#
+#  - test:
+#      name: test s3select with depth1 queries on csv objects
+#      desc: test s3select with depth1 queries of incorrect syntax for checking rgw crashes on csv objects
+#      polarion-id: CEPH-83575176
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_s3select.py
+#        config-file-name: test_s3select_query_gen_csv_depth1.yaml
+#
+#  - test:
+#      name: test s3select with depth2 queries on csv objects
+#      desc: test s3select with depth2 queries of incorrect syntax for checking rgw crashes on csv objects
+#      polarion-id: CEPH-83575176
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_s3select.py
+#        config-file-name: test_s3select_query_gen_csv_depth2.yaml
+#
+#  - test:
+#      name: test s3select with depth1 queries on parquet objects
+#      desc: test s3select with depth1 queries of incorrect syntax for checking rgw crashes on parquet objects
+#      polarion-id: CEPH-83575176
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_s3select.py
+#        config-file-name: test_s3select_query_gen_parquet_depth1.yaml
+#
+#  - test:
+#      name: test s3select with depth2 queries on parquet objects
+#      desc: test s3select with depth2 queries of incorrect syntax for checking rgw crashes on parquet objects
+#      polarion-id: CEPH-83575176
+#      module: sanity_rgw.py
+#      config:
+#        script-name: test_s3select.py
+#        config-file-name: test_s3select_query_gen_parquet_depth2.yaml
 
-  - test:
-      name: test bucket policy with invalid key
-      desc: test bucket policy with invalid key
-      polarion-id: CEPH-83572755
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_policy_ops.py
-        config-file-name: test_bucket_policy_invalid_key.yaml
-
-  - test:
-      name: test bucket policy with invalid principal
-      desc: test bucket policy with invalid principal
-      polarion-id: CEPH-83572755
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_policy_ops.py
-        config-file-name: test_bucket_policy_invalid_principal.yaml
-
-  - test:
-      name: test bucket policy with invalid resource
-      desc: test bucket policy with invalid resource
-      polarion-id: CEPH-83572755
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_policy_ops.py
-        config-file-name: test_bucket_policy_invalid_resource.yaml
-
-  - test:
-      name: test bucket policy with invalid version
-      desc: test bucket policy with invalid version
-      polarion-id: CEPH-83572755
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_policy_ops.py
-        config-file-name: test_bucket_policy_invalid_version.yaml
-
-  # Bucket lifecycle tests
-
-  - test:
-      name: test bucket lc rule conflict between expiration and transition
-      desc: test bucket lc rule conflict between expiration and transition
-      polarion-id: CEPH-11184
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_lifecycle_object_expiration_transition.py
-        config-file-name: test_lc_rule_conflict_btw_exp_transition.yaml
-
-  - test:
-      name: test bucket lc rule conflict between expiration days
-      desc: test bucket lc rule conflict between expiration days
-      polarion-id: CEPH-11184
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_lifecycle_object_expiration_transition.py
-        config-file-name: test_lc_rule_conflict_exp_days.yaml
-
-  - test:
-      name: test bucket lc rule conflict between transition actions
-      desc: test bucket lc rule conflict between transition actions
-      polarion-id: CEPH-11184
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_lifecycle_object_expiration_transition.py
-        config-file-name: test_lc_rule_conflict_transition_actions.yaml
-
-  - test:
-      name: test bucket lc rules with same ruleid but different rules
-      desc: test bucket lc rules with same ruleid but different rules
-      polarion-id: CEPH-11183
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_lifecycle_object_expiration_transition.py
-        config-file-name: test_lc_rule_same_rule_id_diff_rules.yaml
-
-  - test:
-      name: Test bucket lc reverse transition
-      desc: Test bucket lc reverse transition
-      polarion-id: CEPH-83573373
-      module: sanity_rgw.py
-      config:
-        script-name: test_bucket_lifecycle_object_expiration_transition.py
-        config-file-name: test_lc_rule_reverse_transition.yaml
-
-  # swift container operation
-  - test:
-      name: swift enabling versioning on a bucket that is S3 versioned
-      desc: test swift enabling versioning on a bucket that is S3 versioned
-      polarion-id: CEPH-10649
-      module: sanity_rgw.py
-      config:
-        script-name: test_swift_basic_ops.py
-        config-file-name: test_s3_and_swift_versioning.yaml
-
-  # test s3-select with query generation of incorrect syntax
-
-  - test:
-      abort-on-fail: true
-      config:
-        role: client
-        sudo: True
-        commands:
-          - "echo '\n\n# increase limit on number of open files\n*               soft    nofile          16384\n*               hard    nofile          16384' >> /etc/security/limits.conf"
-          - "echo 'ulimit -n 16384' >> /etc/profile"
-      desc: increase ulimit number of open files to 16384
-      module: exec.py
-      name: increase ulimit number of open files to 16384
-
-  - test:
-      name: test s3select with depth1 queries on csv objects
-      desc: test s3select with depth1 queries of incorrect syntax for checking rgw crashes on csv objects
-      polarion-id: CEPH-83575176
-      module: sanity_rgw.py
-      config:
-        script-name: test_s3select.py
-        config-file-name: test_s3select_query_gen_csv_depth1.yaml
-
-  - test:
-      name: test s3select with depth2 queries on csv objects
-      desc: test s3select with depth2 queries of incorrect syntax for checking rgw crashes on csv objects
-      polarion-id: CEPH-83575176
-      module: sanity_rgw.py
-      config:
-        script-name: test_s3select.py
-        config-file-name: test_s3select_query_gen_csv_depth2.yaml
-
-  - test:
-      name: test s3select with depth1 queries on parquet objects
-      desc: test s3select with depth1 queries of incorrect syntax for checking rgw crashes on parquet objects
-      polarion-id: CEPH-83575176
-      module: sanity_rgw.py
-      config:
-        script-name: test_s3select.py
-        config-file-name: test_s3select_query_gen_parquet_depth1.yaml
+  # test MOD hotfix bz: complete and abort multipart upload race causes obj download failure after gc kicks in
 
   - test:
-      name: test s3select with depth2 queries on parquet objects
-      desc: test s3select with depth2 queries of incorrect syntax for checking rgw crashes on parquet objects
-      polarion-id: CEPH-83575176
+      name: test MOD hotfix bz - 404 again
+      desc: complete and abort multipart upload race causes obj download failure after gc kicks in
+      polarion-id: CEPH-83604471
       module: sanity_rgw.py
       config:
-        script-name: test_s3select.py
-        config-file-name: test_s3select_query_gen_parquet_depth2.yaml
+        script-name: test_Mbuckets_with_Nobjects.py
+        config-file-name: test_Mbuckets_with_Nobjects_multipart_upload_complete_abort_race.yaml
diff --git a/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml b/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml
index 9500b1fb7..54371ee91 100644
--- a/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml
+++ b/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml
@@ -122,7 +122,7 @@ tests:
                         nodes:
                           - node5
       desc: RHCS cluster deployment and rgw deployment with ssl cert generation
-      polarion-id: CEPH-83575222
+      polarion-id: CEPH-83604472
       destroy-cluster: false
       module: test_cephadm.py
       name: deploy cluster and rgw with ssl gen-cert
diff --git a/suites/squid/rgw/tier-4-rgw.yaml b/suites/squid/rgw/tier-4-rgw.yaml
index d47d500eb..9887d03ba 100644
--- a/suites/squid/rgw/tier-4-rgw.yaml
+++ b/suites/squid/rgw/tier-4-rgw.yaml
@@ -279,3 +279,14 @@ tests:
       config:
         script-name: test_s3select.py
         config-file-name: test_s3select_query_gen_parquet_depth2.yaml
+
+  # test MOD hotfix bz: complete and abort multipart upload race causes obj download failure after gc kicks in
+
+  - test:
+      name: test MOD hotfix bz - 404 again
+      desc: complete and abort multipart upload race causes obj download failure after gc kicks in
+      polarion-id: CEPH-83604471
+      module: sanity_rgw.py
+      config:
+        script-name: test_Mbuckets_with_Nobjects.py
+        config-file-name: test_Mbuckets_with_Nobjects_multipart_upload_complete_abort_race.yaml