diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d8a9a0b3fd2a..05266fb4689f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,33 +5,12 @@
 /Config/approved_categories.json @yaakovpraisler @bakatzir @GuyLibermanPA @demisto/content-leaders
 /Config/core_packs_list.json @yaakovpraisler @bakatzir @GuyLibermanPA @demisto/content-leaders
 /Config/core_packs_mpv2_list.json @yaakovpraisler @bakatzir @GuyLibermanPA @demisto/content-leaders
-/Tests/Marketplace/versions-metadata.json @yaakovpraisler
 /Config/corepacks_override.json @yaakovpraisler
 
 # Docker native image
 /Tests/docker_native_image_config.json @JudahSchwartz @shmuel44
 
-# Marketplace & Upload-Flow
-/Tests/scripts/create_artifacts_graph/create_artifacts.py @RosenbergYehuda
-/Tests/Marketplace/upload_git_snapshot.py @yaakovpraisler
-/Tests/Marketplace/install_packs.sh @yaakovpraisler
-/Tests/Marketplace/configure_and_install_packs.py @yaakovpraisler
-/Tests/Marketplace/copy_and_upload_packs.py @yaakovpraisler
-/Tests/Marketplace/marketplace_services.py @yaakovpraisler @RosenbergYehuda
-/Tests/Marketplace/marketplace_statistics.py @yaakovpraisler
-/Tests/Marketplace/marketplace_constants.py @yaakovpraisler
-/Tests/Marketplace/zip_packs.py @yaakovpraisler
-/Tests/Marketplace/upload_packs.py @yaakovpraisler @RosenbergYehuda
-/Tests/Marketplace/packs_dependencies.py @yaakovpraisler
-/Tests/Marketplace/search_and_install_packs.py @yaakovpraisler
-/Tests/scripts/prepare_content_packs_for_testing.sh @yaakovpraisler
-/Utils/trigger_test_upload_flow.sh @yaakovpraisler
-/Utils/trigger_upload_packs_to_production.sh @yaakovpraisler
-/Utils/should_trigger_test_upload.sh @yaakovpraisler
-/Utils/test_upload_flow/* @yaakovpraisler
-
 # Test Collection
-/Tests/scripts/collect_tests @dorschw @michal-dagan
 /Tests/conf.json @sapirshuker
 
 # PANW Products
@@ -73,28 +52,11 @@
 /Packs/CommonScripts/Scripts/ExtractEmailV2/* @Ni-Knight
 /Packs/CommonScripts/Scripts/UnEscapeIPs/* @Ni-Knight
 
-
 # Build related
 .circleci/config.yml @yucohen
-.gitlab/ci/* @yucohen
-.gitlab/* @yucohen
-.gitlab-ci.yml @yucohen
-/Tests/scripts/wait_in_line_for_cloud_env.sh @yucohen
-/Tests/scripts/uninstall_packs_and_reset_bucket_cloud.sh @yucohen
-/Tests/Marketplace/search_and_uninstall_pack.py @yucohen
-/Tests/scripts/install_content_and_test_integrations.sh @yucohen
-/Tests/configure_and_test_integration_instances.py @yucohen
-/Tests/scripts/print_cloud_machine_details.sh @yucohen
-/Tests/scripts/run_tests.sh @yucohen
-/Tests/scripts/download_demisto_conf.sh @yucohen
-Tests/scripts/test_modeling_rules.sh @AradCarmi
-Tests/scripts/lock_cloud_machines.py @yucohen
-Tests/Marketplace/server_content_items.json @dantavori
-validation_config.toml @YuvHayun @JudahSchwartz @anara123 @SamuelFain
 
 # SDK Related
-.gitlab/ci/.gitlab-ci.sdk-nightly.yml @SamuelFain
-.pre-commit-config_template.yaml @SamuelFain
+.pre-commit-config_template.yaml @SamuelFain @YuvHayun
 
 # XDR Related
 /Packs/CortexXDR/Integrations/ @maimorag
diff --git a/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.py b/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.py
index 00307f4f6b12..cb8ee6515367 100644
--- a/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.py
+++ b/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.py
@@ -2102,6 +2102,47 @@ def get_cps_change_status(self,
                                   headers=headers,
                                   )
 
+    def cancel_cps_change(self, change_path: str, account_switch_key: str = "") -> dict:
+        """
+            Cancels a pending change.
+
+        Args:
+            change_path: Change path on which to perform the desired operation.
+            account_switch_key: For customers who manage more than one account,
+                this runs the operation from another account. The Identity and
+                Access Management API provides a list of available account switch keys.
+
+        Returns:
+            The response provides a dict of change_path.
+
+        """
+        method = 'delete'
+        headers = {"accept": "application/vnd.akamai.cps.change-id.v1+json"}
+        params = {"accountSwitchKey": account_switch_key}
+        return self._http_request(method=method,
+                                  url_suffix=change_path,
+                                  headers=headers,
+                                  params=params,
+                                  )
+
+    def get_cps_enrollment_by_id(self,
+                                 enrollment_id: int) -> dict:
+        """
+            Returns the Enarollment by enrollment id
+        Args:
+            enrollment_id: Unique Identifier of the Enrollment on which to perform the desired operation.
+
+        Returns:
+            The response provides a deployment associcated to the enrollment id
+
+        """
+        headers = {"accept": "application/vnd.akamai.cps.enrollment.v12+json"}
+        method = "GET"
+        return self._http_request(method=method,
+                                  url_suffix=f'cps/v2/enrollments/{enrollment_id}',
+                                  headers=headers,
+                                  )
+
 
 ''' HELPER FUNCTIONS '''
 
@@ -5912,6 +5953,91 @@ def get_cps_change_status_command(client: Client,
     return human_readable, context_entry, raw_response
 
 
+@logger
+def cancel_cps_change_command(client: Client,
+                              change_id: str = '0',
+                              enrollment_id: str = '0',
+                              change_path: str = "",
+                              account_switch_key: str = "",
+                              ) -> tuple[str, dict, Union[list, dict]]:
+    """
+        Cancels a pending change.
+        Reference: https://techdocs.akamai.com/cps/reference/delete-enrollment-change
+    Args:
+        client:
+        change_id: The change for this enrollment on which to perform the desired operation. Default is 0.
+        enrollment_id: Enrollment on which to perform the desired operation. Default is 0.
+        change_path: Change path on which to perform the desired operation.
+         - Sample: /cps/v2/enrollments/100000/changes/88888888
+         - Note: change_path is not listed in the reference as a parameter.
+                 However it can be extracted directly from "list_enrollments_command".
+                 This should be the most common useage when generate RestAPI's URL.
+        account_switch_key: For customers who manage more than one account, this runs
+            the operation from another account. The Identity and Access Management API
+            provides a list of available account switch keys.
+         - Sample: "1-5C0YLB:1-8BYUX"
+
+        NOTE: There is no need to provice "change_id"/"enrollment_id" and "change_path"
+              at the same time. "change_id"/"enrollment_id" can be used to generate
+              "change_path" as well.
+
+    Returns:
+        human readable (markdown format), entry context and raw response
+    """
+
+    if not (change_id == '0' and enrollment_id == '0'):
+        change_path = f'/cps/v2/enrollments/{enrollment_id}/changes/{change_id}'
+
+    raw_response: dict = client.cancel_cps_change(change_path=change_path, account_switch_key=account_switch_key)
+
+    title = f'{INTEGRATION_NAME} - cps cancel change'
+    entry_context = raw_response
+    human_readable_ec = raw_response
+    context_entry: dict = {
+        f"{INTEGRATION_CONTEXT_NAME}.Cps.Change.Canceled": entry_context
+    }
+
+    human_readable = tableToMarkdown(
+        name=title,
+        t=human_readable_ec,
+        removeNull=True,
+    )
+    return human_readable, context_entry, raw_response
+
+
+# Created by D.S. 2024-06-18
+@logger
+def get_cps_enrollment_by_id_command(client: Client,
+                                     enrollment_id: int) -> tuple[str, dict, Union[list, dict]]:
+    """
+        Returns the certification/Enarollment.
+
+    Args:
+        client:
+        enrollment_id: Unique Identifier of the Enrollment on which to perform the desired operation.
+            And it can be retrived via list_enrollments_command
+
+    Returns:
+        human readable (markdown format), entry context and raw response
+    """
+
+    raw_response: dict = client.get_cps_enrollment_by_id(enrollment_id=enrollment_id)
+
+    title = f'{INTEGRATION_NAME} - get cps enrollment by id command'
+    entry_context = raw_response
+    human_readable_ec = raw_response
+    context_entry: dict = {
+        f"{INTEGRATION_CONTEXT_NAME}.Cps.Enrollments": entry_context
+    }
+
+    human_readable = tableToMarkdown(
+        name=title,
+        t=human_readable_ec,
+        removeNull=True,
+    )
+    return human_readable, context_entry, raw_response
+
+
 ''' COMMANDS MANAGER / SWITCH PANEL '''
 
 
@@ -6006,6 +6132,8 @@ def main():
         f'{INTEGRATION_COMMAND_NAME}-update-cps-enrollment': update_cps_enrollment_command,
         f'{INTEGRATION_COMMAND_NAME}-update-cps-enrollment-schedule': update_cps_enrollment_schedule_command,
         f'{INTEGRATION_COMMAND_NAME}-get-cps-change-status': get_cps_change_status_command,
+        f'{INTEGRATION_COMMAND_NAME}-cancel-cps-change': cancel_cps_change_command,
+        f'{INTEGRATION_COMMAND_NAME}-get-cps-enrollment-by-id': get_cps_enrollment_by_id_command,
     }
     try:
         readable_output, outputs, raw_response = commands[command](client=client, **demisto.args())
diff --git a/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.yml b/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.yml
index 092af00bb75d..610e839c0b5d 100644
--- a/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.yml
+++ b/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF.yml
@@ -1489,7 +1489,28 @@ script:
     - contextPath: Akamai.Enrollments.Change.Status
       description: Akamai enrollments change status.
       type: Dictionary
-  dockerimage: demisto/auth-utils:1.0.0.94075
+  - arguments:
+    - defaultValue: '0'
+      description: The change for this enrollment on which to perform the desired operation. Default is 0. "change_path" is used.
+      name: change_id
+      required: true
+    - defaultValue: '0'
+      description: Enrollment on which to perform the desired operation. Default is 0. "change_path" is used.
+      name: enrollment_id
+      required: true
+    - description: "Change path on which to perform the desired operation. Sample: /cps/v2/enrollments/100000/changes/88888888. Note: change_path is not listed in the reference as a parameter. However it can be extracted directly from \"list_enrollments_command\". This should be the most common usage when generating the RestAPI's URL."
+      name: change_path
+    - description: For customers who manage more than one account, this runs the operation from another account. The Identity and Access Management API provides a list of available account switch keys.
+      name: account_switch_key
+    description: Cancels a pending change on CPS.
+    name: akamai-cancel-cps-change
+  - arguments:
+    - description: Enrollment ID on which to perform the desired operation.
+      name: enrollment_id
+      required: true
+    description: Get an enrollment in CPS by enrollment id.
+    name: akamai-get-cps-enrollment-by-id
+  dockerimage: demisto/auth-utils:1.0.0.105764
   script: ''
   subtype: python3
   type: python
diff --git a/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF_test.py b/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF_test.py
index 72ae7e3c887e..83cb1a6f8f5a 100644
--- a/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF_test.py
+++ b/Packs/Akamai_WAF/Integrations/Akamai_WAF/Akamai_WAF_test.py
@@ -10,6 +10,14 @@ def util_load_json(path):
         return json.loads(f.read())
 
 
+def util_load_txt(path: str):
+    """
+    Utility to load text data from a local folder.
+    """
+    with open(path, encoding='utf-8') as file:
+        return file.read()
+
+
 @pytest.fixture(scope='module')
 def akamai_waf_client():
     return Client(base_url="https://hostname/",
@@ -250,3 +258,52 @@ def test_acknowledge_warning_command(mocker, akamai_waf_client):
     assert expected_raw_response == raw_response
     assert expected_human_readable == human_readable
     assert expected_context_entry == context_entry
+
+
+def test_cancel_cps_change_command(mocker, akamai_waf_client):
+    """
+    Given:
+        - enrollment ID and change ID.
+    When:
+        - running the command cancel_cps_change_command.
+    Then:
+        - enrollment ID is cancelled correctly.
+    """
+    from Akamai_WAF import cancel_cps_change_command
+    expected_raw_response = {
+        "change": "/cps/v2/enrollments/193622/changes/3914270"
+    }
+    expected_human_readable = "### Akamai WAF - cps cancel change\n|change|\n|---|\n|\
+ /cps/v2/enrollments/193622/changes/3914270 |\n"
+    expected_context_entry = {
+        'Akamai.Cps.Change.Canceled': {
+            'change': '/cps/v2/enrollments/193622/changes/3914270'
+        }
+    }
+    mocker.patch.object(akamai_waf_client, 'cancel_cps_change', return_value=expected_raw_response)
+    human_readable, context_entry, raw_response = cancel_cps_change_command(client=akamai_waf_client,
+                                                                            enrollment_id="193622",
+                                                                            change_id="3914270")
+    assert expected_raw_response == raw_response
+    assert expected_human_readable == human_readable
+    assert expected_context_entry == context_entry
+
+
+def test_get_cps_enrollment_by_id_command(mocker, akamai_waf_client):
+    """
+    Given:
+        - enrollment ID.
+    When:
+        - running the command get_cps_enrollment_by_id_command.
+    Then:
+        - we get details of enrollment.
+    """
+    from Akamai_WAF import get_cps_enrollment_by_id_command
+    test_data = util_load_json('test_data/get_cps_enrollment_by_id_test.json')
+    expected_raw_response = test_data
+    expected_context_entry = util_load_json('test_data/get_cps_enrollment_by_id_context.json')
+
+    mocker.patch.object(akamai_waf_client, 'get_cps_enrollment_by_id', return_value=expected_raw_response)
+    _, context_entry, raw_response = get_cps_enrollment_by_id_command(client=akamai_waf_client, enrollment_id=193622)
+    assert expected_raw_response == raw_response
+    assert expected_context_entry == context_entry
diff --git a/Packs/Akamai_WAF/Integrations/Akamai_WAF/README.md b/Packs/Akamai_WAF/Integrations/Akamai_WAF/README.md
index f37d8639a161..0026b3f0eb1d 100644
--- a/Packs/Akamai_WAF/Integrations/Akamai_WAF/README.md
+++ b/Packs/Akamai_WAF/Integrations/Akamai_WAF/README.md
@@ -1683,4 +1683,43 @@ Gets the status of a pending change.
                 }
               }
 }}}}
-```
\ No newline at end of file
+```
+### akamai-get-cps-enrollment-by-id
+
+***
+Get an enrollment in CPS by enrollment id
+
+#### Base Command
+
+`akamai-get-cps-enrollment-by-id`
+
+#### Input
+
+| **Argument Name** | **Description** | **Required** |
+| --- | --- | --- |
+| enrollment_id | Enrollment on which to perform the desired operation. | Required | 
+
+#### Context Output
+
+There is no context output for this command.
+### akamai-cancel-cps-change
+
+***
+Cancels a pending change on CPS.
+
+#### Base Command
+
+`akamai-cancel-cps-change`
+
+#### Input
+
+| **Argument Name** | **Description** | **Required** |
+| --- | --- | --- |
+| change_id | The change for this enrollment on which to perform the desired operation. Default is 0. "change_path" is used. Default is 0. | Required | 
+| enrollment_id | Enrollment on which to perform the desired operation. Default is 0. "change_path" is used. Default is 0. | Required | 
+| change_path | Change path on which to perform the desired operation. Sample: /cps/v2/enrollments/100000/changes/88888888. Note: change_path is not listed in the reference as a parameter. However it can be extracted directly from "list_enrollments_command". This should be the most common useage when generate RestAPI's URL. | Optional | 
+| account_switch_key | For customers who manage more than one account, this runs the operation from another account. The Identity and Access Management API provides a list of available account switch keys. | Optional | 
+
+#### Context Output
+
+There is no context output for this command.
diff --git a/Packs/Akamai_WAF/Integrations/Akamai_WAF/test_data/get_cps_enrollment_by_id_context.json b/Packs/Akamai_WAF/Integrations/Akamai_WAF/test_data/get_cps_enrollment_by_id_context.json
new file mode 100644
index 000000000000..83f96240ab77
--- /dev/null
+++ b/Packs/Akamai_WAF/Integrations/Akamai_WAF/test_data/get_cps_enrollment_by_id_context.json
@@ -0,0 +1 @@
+{"Akamai.Cps.Enrollments": {"adminContact": {"addressLineOne": "601 Riverside Avenue", "addressLineTwo": null, "city": null, "country": null, "email": "Akamaizers@test.com", "firstName": "FIS", "lastName": "Akamaizers", "organizationName": null, "phone": "123-123-1234", "postalCode": null, "region": null, "title": null}, "assignedSlots": [168334], "autoRenewalStartTime": null, "certificateChainType": "default", "certificateType": "third-party", "changeManagement": true, "csr": {"c": "US", "cn": "tools-portal-app-mbp-amex-batest.dev.fiscloudservices.com", "l": "Jacksonville", "o": "Fidelity National Information Services", "ou": "Fidelity National Information Services", "preferredTrustChain": null, "sans": ["tools-portal-app-mbp-amex-batest.dev.fiscloudservices.com"], "st": "Florida"}, "enableMultiStackedCertificates": true, "id": 190080, "location": "/cps/v2/enrollments/190080", "maxAllowedSanNames": 100, "maxAllowedWildcardSanNames": 100, "networkConfiguration": {"clientMutualAuthentication": null, "disallowedTlsVersions": ["TLSv1","TLSv1_1"], "dnsNameSettings": {"cloneDnsNames":true,"dnsNames":["tools-portal-app-mbp-amex-batest.dev.fiscloudservices.com"]}, "fipsMode": null, "geography": "core", "mustHaveCiphers": "ak-akamai-2020q1", "ocspStapling": "on", "preferredCiphers": "ak-akamai-2020q1", "quicEnabled": true, "secureNetwork": "enhanced-tls", "sniOnly": true}, "org": {"addressLineOne": "601 Riverside Avenue", "addressLineTwo": null, "city": "Jacksonville", "country": "US", "name": "Fidelity National Information Services", "phone": "501-220-5100", "postalCode": "32204", "region": "Florida"}, "orgId": null, "pendingChanges": [{"changeType":"renewal","location":"/cps/v2/enrollments/190080/changes/5231996"}], "productionSlots": [168334], "ra": "third-party", "signatureAlgorithm": null, "stagingSlots": [168334], "techContact": {"addressLineOne": null, "addressLineTwo": null, "city": null, "country": null, "email": "test-ps@akamai.com", "firstName": "FIS", "lastName": "PS", "organizationName": null, "phone": "877-425-2832", "postalCode": null, "region": null, "title": null}, "thirdParty": {"excludeSans": false}, "validationType": "third-party"}}
\ No newline at end of file
diff --git a/Packs/Akamai_WAF/Integrations/Akamai_WAF/test_data/get_cps_enrollment_by_id_test.json b/Packs/Akamai_WAF/Integrations/Akamai_WAF/test_data/get_cps_enrollment_by_id_test.json
new file mode 100644
index 000000000000..467d13885840
--- /dev/null
+++ b/Packs/Akamai_WAF/Integrations/Akamai_WAF/test_data/get_cps_enrollment_by_id_test.json
@@ -0,0 +1,24 @@
+{
+    "adminContact":{
+        "addressLineOne":"601 Riverside Avenue",
+        "addressLineTwo":null,
+        "city":null,
+        "country":null,
+        "email":"Akamaizers@test.com",
+        "firstName":"FIS",
+        "lastName":"Akamaizers",
+        "organizationName":null,
+        "phone":"123-123-1234",
+        "postalCode":null,
+        "region":null,
+        "title":null
+    },
+    "assignedSlots":[168334],
+    "autoRenewalStartTime":null,
+    "certificateChainType":"default",
+    "certificateType":"third-party",
+    "changeManagement":true,
+    "csr":{"c":"US","cn":"tools-portal-app-mbp-amex-batest.dev.fiscloudservices.com","l":"Jacksonville","o":"Fidelity National Information Services","ou":"Fidelity National Information Services","preferredTrustChain":null,"sans":["tools-portal-app-mbp-amex-batest.dev.fiscloudservices.com"],"st":"Florida"},"enableMultiStackedCertificates":true,"id":190080,"location":"/cps/v2/enrollments/190080","maxAllowedSanNames":100,"maxAllowedWildcardSanNames":100,"networkConfiguration":{"clientMutualAuthentication":null,"disallowedTlsVersions":["TLSv1","TLSv1_1"],"dnsNameSettings":{"cloneDnsNames":true,"dnsNames":["tools-portal-app-mbp-amex-batest.dev.fiscloudservices.com"]},"fipsMode":null,"geography":"core","mustHaveCiphers":"ak-akamai-2020q1","ocspStapling":"on","preferredCiphers":"ak-akamai-2020q1","quicEnabled":true,"secureNetwork":"enhanced-tls","sniOnly":true},"org":{"addressLineOne":"601 Riverside Avenue","addressLineTwo":null,"city":"Jacksonville","country":"US","name":"Fidelity National Information Services","phone":"501-220-5100","postalCode":"32204","region":"Florida"},"orgId":null,"pendingChanges":[{"changeType":"renewal","location":"/cps/v2/enrollments/190080/changes/5231996"}],"productionSlots":[168334],"ra":"third-party","signatureAlgorithm":null,"stagingSlots":[168334],"techContact":{"addressLineOne":null,"addressLineTwo":null,"city":null,"country":null,"email":"test-ps@akamai.com","firstName":"FIS","lastName":"PS","organizationName":null,"phone":"877-425-2832","postalCode":null,"region":null,"title":null},
+    "thirdParty":{"excludeSans":false},
+    "validationType":"third-party"
+}
\ No newline at end of file
diff --git a/Packs/Akamai_WAF/ReleaseNotes/2_0_12.md b/Packs/Akamai_WAF/ReleaseNotes/2_0_12.md
new file mode 100644
index 000000000000..09a70b100e2e
--- /dev/null
+++ b/Packs/Akamai_WAF/ReleaseNotes/2_0_12.md
@@ -0,0 +1,9 @@
+
+#### Integrations
+
+##### Akamai WAF
+- Updated the Docker image to: *demisto/auth-utils:1.0.0.105764*.
+
+  - Added 2 commands:
+    - ***akamai-cancel-cps-change***
+    - ***akamai-get-cps-enrollment-by-id***
diff --git a/Packs/Akamai_WAF/pack_metadata.json b/Packs/Akamai_WAF/pack_metadata.json
index de330bb2ea05..5ea59016041d 100644
--- a/Packs/Akamai_WAF/pack_metadata.json
+++ b/Packs/Akamai_WAF/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Akamai WAF",
     "description": "Use the Akamai WAF integration to manage common sets of lists used by various Akamai security products and features.",
     "support": "xsoar",
-    "currentVersion": "2.0.11",
+    "currentVersion": "2.0.12",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/ApiModules/Scripts/MicrosoftGraphMailApiModule/MicrosoftGraphMailApiModule.py b/Packs/ApiModules/Scripts/MicrosoftGraphMailApiModule/MicrosoftGraphMailApiModule.py
index 1cd98dd89b22..b297a5d3b0f1 100644
--- a/Packs/ApiModules/Scripts/MicrosoftGraphMailApiModule/MicrosoftGraphMailApiModule.py
+++ b/Packs/ApiModules/Scripts/MicrosoftGraphMailApiModule/MicrosoftGraphMailApiModule.py
@@ -37,6 +37,7 @@ def __init__(self, mailbox_to_fetch, folder_to_fetch, first_fetch_interval, emai
                  mark_fetched_read: bool = False,
                  look_back: int | None = 0,
                  fetch_html_formatting=True,
+                 legacy_name=False,
                  **kwargs):
         super().__init__(retry_on_rate_limit=True, managed_identities_resource_uri=Resources.graph,
                          command_prefix="msgraph-mail",
@@ -49,6 +50,7 @@ def __init__(self, mailbox_to_fetch, folder_to_fetch, first_fetch_interval, emai
         self._mark_fetched_read = mark_fetched_read
         self._look_back = look_back
         self.fetch_html_formatting = fetch_html_formatting
+        self.legacy_name = legacy_name
 
     @classmethod
     def _build_inline_layout_attachments_input(cls, inline_from_layout_attachments):
@@ -277,11 +279,11 @@ def _get_email_attachments(self, message_id, user_id=None, overwrite_rate_limit_
         for attachment in attachments:
 
             attachment_type = attachment.get('@odata.type', '')
-            attachment_identifier_id = attachment.get('contentId')
-            if not attachment_identifier_id or attachment_identifier_id == "None":
-                attachment_identifier_id = attachment.get('id', '')
-            attachment_name = f"{attachment_identifier_id}-attachmentName-{attachment.get('name', 'untitled_attachment')}"
-
+            attachment_content_id = attachment.get('contentId')
+            attachment_is_inline = attachment.get('isInline')
+            attachment_name = attachment.get('name', 'untitled_attachment')
+            if attachment_is_inline and not self.legacy_name and attachment_content_id and attachment_content_id != "None":
+                attachment_name = f"{attachment_content_id}-attachmentName-{attachment_name}"
             if not attachment_name.isascii():
                 try:
                     demisto.debug(f"Trying to decode the attachment file name: {attachment_name}")
@@ -1287,7 +1289,7 @@ def item_result_creator(raw_attachment, user_id) -> CommandResults:
             return CommandResults(readable_output=human_readable, raw_response=raw_attachment)
 
     @staticmethod
-    def file_result_creator(raw_attachment: dict) -> dict:
+    def file_result_creator(raw_attachment: dict, legacy_name=False) -> dict:
         """Create FileResult from the attachment
 
         Args:
@@ -1299,10 +1301,11 @@ def file_result_creator(raw_attachment: dict) -> dict:
         Returns:
             dict: FileResult with the b64decode of the attachment content
         """
-        identifier_id = raw_attachment.get('contentId')
-        if not identifier_id or identifier_id == "None":
-            identifier_id = raw_attachment.get('id', '')
-        name = f"{identifier_id}-attachmentName-{raw_attachment.get('name','')}"
+        name = raw_attachment.get('name', '')
+        content_id = raw_attachment.get('contentId')
+        is_inline = raw_attachment.get('isInline')
+        if is_inline and content_id and content_id != "None" and not legacy_name:
+            name = f"{content_id}-attachmentName-{name}"
         data = raw_attachment.get('contentBytes')
         try:
             data = base64.b64decode(data)  # type: ignore
@@ -1311,7 +1314,7 @@ def file_result_creator(raw_attachment: dict) -> dict:
             raise DemistoException('Attachment could not be decoded')
 
     @staticmethod
-    def create_attachment(raw_attachment, user_id) -> CommandResults | dict:
+    def create_attachment(raw_attachment, user_id, legacy_name=False) -> CommandResults | dict:
 
         attachment_type = raw_attachment.get('@odata.type', '')
         # Documentation about the different attachment types
@@ -1319,7 +1322,7 @@ def create_attachment(raw_attachment, user_id) -> CommandResults | dict:
         if 'itemAttachment' in attachment_type:
             return GraphMailUtils.item_result_creator(raw_attachment, user_id)
         elif 'fileAttachment' in attachment_type:
-            return GraphMailUtils.file_result_creator(raw_attachment)
+            return GraphMailUtils.file_result_creator(raw_attachment, legacy_name)
         else:
             human_readable = f'Integration does not support attachments from type {attachment_type}'
             return CommandResults(readable_output=human_readable, raw_response=raw_attachment)
@@ -1828,14 +1831,8 @@ def get_attachment_command(client: MsGraphMailBaseClient, args) -> list[CommandR
     kwargs = {arg_key: args.get(arg_key) for arg_key in ['message_id', 'folder_id', 'attachment_id']}
     kwargs['user_id'] = args.get('user_id', client._mailbox_to_fetch)
     raw_response = client.get_attachment(**kwargs)
-    identifiers_filter = argToList(args.get('identifiers_filter'))
-    return [GraphMailUtils.create_attachment(attachment, user_id=kwargs['user_id'])
-            for attachment in raw_response
-            if (
-                (not identifiers_filter)
-                or (attachment.get('contentId') in identifiers_filter or attachment.get('id') in identifiers_filter)
-    )
-    ]
+    return [GraphMailUtils.create_attachment(attachment, user_id=kwargs['user_id'], legacy_name=client.legacy_name)
+            for attachment in raw_response]
 
 
 def create_folder_command(client: MsGraphMailBaseClient, args) -> CommandResults:
diff --git a/Packs/CrowdStrikeFalcon/Classifiers/classifier-CrowdStrike_Falcon_Mapper_6.5.json b/Packs/CrowdStrikeFalcon/Classifiers/classifier-CrowdStrike_Falcon_Mapper_6.5.json
index 0e41d719d4d5..5c376f2eeca5 100644
--- a/Packs/CrowdStrikeFalcon/Classifiers/classifier-CrowdStrike_Falcon_Mapper_6.5.json
+++ b/Packs/CrowdStrikeFalcon/Classifiers/classifier-CrowdStrike_Falcon_Mapper_6.5.json
@@ -808,28 +808,6 @@
         "dbot_classification_incident_type_all": {
             "dontMapEventToLabels": false,
             "internalMapping": {
-                "External Start Time": {
-                    "complex": {
-                        "filters": [],
-                        "root": "first_behavior",
-                        "transformers": [
-                            {
-                                "args": {
-                                    "item": {
-                                        "isContext": true,
-                                        "value": {
-                                            "simple": "start"
-                                        }
-                                    }
-                                },
-                                "operator": "append"
-                            }
-                        ]
-                    }
-                },
-                "Additional Data": {
-                    "simple": "behaviors"
-                },
                 "Agent Version": {
                     "simple": "device.agent_version"
                 },
@@ -854,10 +832,10 @@
                     }
                 },
                 "CMD line": {
-                    "simple": "behaviors.cmdline"
+                    "simple": "cmdline"
                 },
                 "Description": {
-                    "simple": "behaviors.description"
+                    "simple": "description"
                 },
                 "Device External IPs": {
                     "complex": {
@@ -966,26 +944,7 @@
                     "simple": "incident_type"
                 },
                 "External Confidence": {
-                    "simple": "max_confidence"
-                },
-                "External End Time": {
-                    "complex": {
-                        "filters": [],
-                        "root": "last_behavior",
-                        "transformers": [
-                            {
-                                "args": {
-                                    "item": {
-                                        "isContext": true,
-                                        "value": {
-                                            "simple": "end"
-                                        }
-                                    }
-                                },
-                                "operator": "append"
-                            }
-                        ]
-                    }
+                    "simple": "confidence"
                 },
                 "External ID": {
                     "complex": {
@@ -1096,16 +1055,16 @@
                     }
                 },
                 "File MD5": {
-                    "simple": "behaviors.md5"
+                    "simple": "md5"
                 },
                 "File Names": {
-                    "simple": "behaviors.filename"
+                    "simple": "filename"
                 },
                 "File Paths": {
-                    "simple": "behaviors.filepath"
+                    "simple": "filepath"
                 },
                 "File SHA256": {
-                    "simple": "behaviors.sha256"
+                    "simple": "sha256"
                 },
                 "Hostnames": {
                     "complex": {
@@ -1146,22 +1105,22 @@
                     "simple": "parent_details.cmdline"
                 },
                 "Parent Process SHA256": {
-                    "simple": "behaviors.parent_details.parent_sha256"
+                    "simple": "parent_details.sha256"
                 },
                 "Parent Process MD5": {
-                    "simple": "behaviors.parent_details.parent_md5"
+                    "simple": "parent_details.md5"
                 },
                 "Process CMD": {
                     "simple": "parent_details.cmdline"
                 },
                 "Process MD5": {
-                    "simple": "behaviors.md5"
+                    "simple": "md5"
                 },
                 "Process SHA256": {
-                    "simple": "behaviors.sha256"
+                    "simple": "sha256"
                 },
                 "Scenario": {
-                    "simple": "behaviors.scenario"
+                    "simple": "scenario"
                 },
                 "Source MAC Address": {
                     "simple": "device.mac_address"
@@ -1182,7 +1141,7 @@
 								"args": {
 									"conditions": {
 										"value": {
-											"simple": "[\n  {\n    \"condition\": \"#{incident_type} == 'detection'\",\n    \"return\": \"Falcon Detection - \" + #{behaviors\\.display_name}  + \" - Detection ID: \" + #{composite_id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'incident'\",\n    \"return\": \"Falcon Incident - ID: \" + #{incident_id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'IDP detection'\",\n    \"return\": #{id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'iom_configurations'\",\n    \"return\": #{id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'ioa_events'\",\n    \"return\": #{event_id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'MOBILE detection'\",\n    \"return\": #{mobile_detection_id}\n  },\n  {\n    \"condition\": \"#{device\\.hostname} != None\",\n    \"return\": #{incident_type} + \" - \" + #{composite_id} + \" - \" + #{device\\.hostname}\n  },\n  {\n    \"condition\": \"#{hosts\\.hostname} != None\",\n    \"return\": #{incident_type} + \" - \" + #{incident_id} + \" - \" + #{hosts\\.hostname}\n  },\n  {\n    \"condition\": \"#{incident_id} != None\",\n    \"return\": #{incident_type} + \" - \" + #{incident_id}\n  },\n  {\n    \"condition\": \"#{composite_id} != None\",\n    \"return\": #{incident_type} + \" - \" + #{composite_id}\n  },\n  {\n    \"default\": #{incident_type}\n  }\n]"
+											"simple": "[\n  {\n    \"condition\": \"#{incident_type} == 'detection'\",\n    \"return\": \"Falcon Detection - \" + #{display_name}  + \" - Detection ID: \" + #{composite_id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'incident'\",\n    \"return\": \"Falcon Incident - ID: \" + #{incident_id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'IDP detection'\",\n    \"return\": #{id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'iom_configurations'\",\n    \"return\": #{id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'ioa_events'\",\n    \"return\": #{event_id}\n  },\n  {\n    \"condition\": \"#{incident_type} == 'MOBILE detection'\",\n    \"return\": #{mobile_detection_id}\n  },\n  {\n    \"condition\": \"#{device\\.hostname} != None\",\n    \"return\": #{incident_type} + \" - \" + #{composite_id} + \" - \" + #{device\\.hostname}\n  },\n  {\n    \"condition\": \"#{hosts\\.hostname} != None\",\n    \"return\": #{incident_type} + \" - \" + #{incident_id} + \" - \" + #{hosts\\.hostname}\n  },\n  {\n    \"condition\": \"#{incident_id} != None\",\n    \"return\": #{incident_type} + \" - \" + #{incident_id}\n  },\n  {\n    \"condition\": \"#{composite_id} != None\",\n    \"return\": #{incident_type} + \" - \" + #{composite_id}\n  },\n  {\n    \"default\": #{incident_type}\n  }\n]"
 										}
 									},
 									"flags": {}
diff --git a/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.py b/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.py
index 789f09a6e55c..2fd27dd34d0b 100644
--- a/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.py
+++ b/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.py
@@ -2026,14 +2026,15 @@ def get_username_uuid(username: str):
     return resources[0]
 
 
-def resolve_detection(ids, status, assigned_to_uuid, show_in_ui, comment):
+def resolve_detection(ids, status, assigned_to_uuid, show_in_ui, comment, tag):
     """
         Sends a resolve detection request
-        :param ids: Single or multiple ids in an array string format
-        :param status: New status of the detection
-        :param assigned_to_uuid: uuid to assign the detection to
-        :param show_in_ui: Boolean flag in string format (true/false)
-        :param comment: Optional comment to add to the detection
+        :param ids: Single or multiple ids in an array string format.
+        :param status: New status of the detection.
+        :param assigned_to_uuid: uuid to assign the detection to.
+        :param show_in_ui: Boolean flag in string format (true/false).
+        :param comment: Optional comment to add to the detection.
+        :param The tag to add.
         :return: Resolve detection response json
     """
     payload = {
@@ -2054,6 +2055,8 @@ def resolve_detection(ids, status, assigned_to_uuid, show_in_ui, comment):
         payload["assign_to_user_id"] = payload.pop("assigned_to_uuid") if "assigned_to_uuid" in payload else None
         payload["update_status"] = payload.pop("status") if "status" in payload else None
         payload["append_comment"] = payload.pop("comment") if "comment" in payload else None
+        if tag:
+            payload["add_tag"] = tag
 
         data = json.dumps(resolve_detections_prepare_body_request(ids, payload))
     else:
@@ -2213,7 +2216,7 @@ def update_detection_request(ids: list[str], status: str) -> dict:
     if status not in DETECTION_STATUS:
         raise DemistoException(f'CrowdStrike Falcon Error: '
                                f'Status given is {status} and it is not in {DETECTION_STATUS}')
-    return resolve_detection(ids=ids, status=status, assigned_to_uuid=None, show_in_ui=None, comment=None)
+    return resolve_detection(ids=ids, status=status, assigned_to_uuid=None, show_in_ui=None, comment=None, tag=None)
 
 
 def update_idp_or_mobile_detection_request(ids: list[str], status: str) -> dict:
@@ -4213,10 +4216,13 @@ def resolve_detection_command():
         assigned_to_uuid = get_username_uuid(username)
 
     status = args.get('status')
+    tag = args.get('tag')
     show_in_ui = args.get('show_in_ui')
-    if not (username or assigned_to_uuid or comment or status or show_in_ui):
+    if not (username or assigned_to_uuid or comment or status or show_in_ui or tag):
         raise DemistoException("Please provide at least one argument to resolve the detection with.")
-    raw_res = resolve_detection(ids, status, assigned_to_uuid, show_in_ui, comment)
+    if LEGACY_VERSION and tag:
+        raise DemistoException("tag argument is only relevant when running with API V3.")
+    raw_res = resolve_detection(ids, status, assigned_to_uuid, show_in_ui, comment, tag)
     args.pop('ids')
     hr = f"Detection {str(ids)[1:-1]} updated\n"
     hr += 'With the following values:\n'
diff --git a/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.yml b/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.yml
index 5802e63e835b..41b585c46faa 100644
--- a/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.yml
+++ b/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon.yml
@@ -453,6 +453,8 @@ script:
       - 'false'
     - description: Username to assign the detections to. (This is usually the user's email address, but may vary based on your configuration). username and assigned_to_uuid are mutually exclusive.
       name: username
+    - description: The tag to add to the detection, supported only for API V3.
+      name: tag
     description: Resolves and updates a detection using the provided arguments. At least one optional argument must be passed, otherwise no change will take place. Note that IDP detections are not supported.
     name: cs-falcon-resolve-detection
   - arguments:
diff --git a/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon_test.py b/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon_test.py
index 6364eca26093..b403410d9200 100644
--- a/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon_test.py
+++ b/Packs/CrowdStrikeFalcon/Integrations/CrowdStrikeFalcon/CrowdStrikeFalcon_test.py
@@ -7209,13 +7209,13 @@ def test_get_detection___url_and_params(mocker, Legacy_version, url_suffix, expe
     assert len(http_request_mocker.call_args_list[0][0]) == expected_len
 
 
-@pytest.mark.parametrize('Legacy_version, url_suffix, data', [
-    (False, "/alerts/entities/alerts/v3",
-     '{"action_parameters": [{"name": "show_in_ui", "value": "True"}, {"name": "assign_to_user_id", "value": "123"}, {"name": "update_status", "value": "resolved"}, {"name": "append_comment", "value": "comment"}], "composite_ids": ["123"]}'),  # noqa: E501
-    (True, '/detects/entities/detects/v2',
+@pytest.mark.parametrize('Legacy_version, tag, url_suffix, data', [
+    (False, "test_tag", "/alerts/entities/alerts/v3",
+     '{"action_parameters": [{"name": "show_in_ui", "value": "True"}, {"name": "assign_to_user_id", "value": "123"}, {"name": "update_status", "value": "resolved"}, {"name": "append_comment", "value": "comment"}, {"name": "add_tag", "value": "test_tag"}], "composite_ids": ["123"]}'),  # noqa: E501
+    (True, None, '/detects/entities/detects/v2',
      '{"ids": ["123"], "status": "resolved", "assigned_to_uuid": "123", "show_in_ui": "True", "comment": "comment"}')
                                                              ])
-def test_resolve_detection(mocker, Legacy_version, url_suffix, data):
+def test_resolve_detection(mocker, Legacy_version, tag, url_suffix, data):
     """
     Given:
         - The Legacy_version flag
@@ -7230,7 +7230,7 @@ def test_resolve_detection(mocker, Legacy_version, url_suffix, data):
     mocker.patch('CrowdStrikeFalcon.LEGACY_VERSION', Legacy_version)
     http_request_mocker = mocker.patch('CrowdStrikeFalcon.http_request')
 
-    resolve_detection(ids=["123"], status="resolved", assigned_to_uuid="123", show_in_ui="True", comment="comment")
+    resolve_detection(ids=["123"], status="resolved", assigned_to_uuid="123", show_in_ui="True", comment="comment", tag=tag)
     assert http_request_mocker.call_args_list[0][0][1] == url_suffix
     assert http_request_mocker.call_args_list[0][1]["data"] == data
 
diff --git a/Packs/CrowdStrikeFalcon/ReleaseNotes/2_0_7.md b/Packs/CrowdStrikeFalcon/ReleaseNotes/2_0_7.md
new file mode 100644
index 000000000000..0c540869a76e
--- /dev/null
+++ b/Packs/CrowdStrikeFalcon/ReleaseNotes/2_0_7.md
@@ -0,0 +1,6 @@
+
+#### Mappers
+
+##### CrowdStrike Falcon Mapper
+
+Fixed an issue where some fields did not align with the newest version of CrowdStrike Falcon. Some fields have been modified, and others have been deleted as they no longer return from CrowdStrike Falcon.
diff --git a/Packs/CrowdStrikeFalcon/ReleaseNotes/2_0_8.md b/Packs/CrowdStrikeFalcon/ReleaseNotes/2_0_8.md
new file mode 100644
index 000000000000..714460ed9e82
--- /dev/null
+++ b/Packs/CrowdStrikeFalcon/ReleaseNotes/2_0_8.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### CrowdStrike Falcon
+
+- Added the **tag** argument to **cs-falcon-resolve-detection** command.
diff --git a/Packs/CrowdStrikeFalcon/pack_metadata.json b/Packs/CrowdStrikeFalcon/pack_metadata.json
index f28c755a7c56..d3e0620adc2c 100644
--- a/Packs/CrowdStrikeFalcon/pack_metadata.json
+++ b/Packs/CrowdStrikeFalcon/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "CrowdStrike Falcon",
     "description": "The CrowdStrike Falcon OAuth 2 API (formerly the Falcon Firehose API), enables fetching and resolving detections, searching devices, getting behaviors by ID, containing hosts, and lifting host containment.",
     "support": "xsoar",
-    "currentVersion": "2.0.6",
+    "currentVersion": "2.0.8",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/CyberChef/CONTRIBUTORS.json b/Packs/CyberChef/CONTRIBUTORS.json
new file mode 100644
index 000000000000..97cf21c7eaa9
--- /dev/null
+++ b/Packs/CyberChef/CONTRIBUTORS.json
@@ -0,0 +1,3 @@
+[
+    "nikstuckenbrock"
+]
\ No newline at end of file
diff --git a/Packs/CyberChef/Integrations/CyberChef/CyberChef.py b/Packs/CyberChef/Integrations/CyberChef/CyberChef.py
index b1f5424e954a..865bb6313e0a 100644
--- a/Packs/CyberChef/Integrations/CyberChef/CyberChef.py
+++ b/Packs/CyberChef/Integrations/CyberChef/CyberChef.py
@@ -1,24 +1,48 @@
+from typing import Optional
 import demistomock as demisto  # noqa: F401
 from CommonServerPython import *  # noqa: F401
 import json
+from subprocess import run
 
 
-def test_module(client):
+def build_params(data: dict) -> list[str]:
+
+    params: list[str] = []
+    for value in data.values():
+        params.append(f'{json.dumps(value)}')
+    return params
+
+def test_module(client: Optional[BaseClient], local_execution: bool):
     data = {'input': 'One, two, three, four.',
             'recipe': 'to decimal'}
-    result = client._http_request('POST', '/bake', json_data=data)
+    if not local_execution and client:
+        result = client._http_request('POST', '/bake', json_data=data)
+    else:
+        params = build_params(data)
+
+        cmd = ['node', '/bake.js']
+        cmd.extend(params)
+        process = run(cmd, capture_output=True, text=True)
+        result = process.stdout
     if result:
         return 'ok'
     else:
         return 'Test failed: ' + str(result)
 
 
-def run_command(client, data, endpoint):
-    response = client._http_request('POST', endpoint, json_data=data)
+def run_command(client: Optional[BaseClient], data: dict, endpoint: str, local_execution: bool):
+    if not local_execution and client:
+        response = client._http_request('POST', endpoint, json_data=data)
+    else:
+        params = build_params(data)
+        cmd = ['node', '/bake.js']
+        cmd.extend(params)
+        process = run(cmd, capture_output=True, text=True)
+        response = process.stdout
     return response
 
 
-def create_output(results, endpoint):
+def create_output(results, endpoint: str):
     output = CommandResults(
         outputs_prefix=f'CyberChef.{endpoint}',
         outputs_key_field='',
@@ -29,41 +53,42 @@ def create_output(results, endpoint):
 
 def main():
     apikey = demisto.params().get('apikey')
+    local_execution = argToBoolean(demisto.params().get('local_execution', 'false'))
 
     # get the service API url
-    base_url = urljoin(demisto.params()['url'], '/cyberchef')
-
-    verify_certificate = not demisto.params().get('insecure', False)
-
-    proxy = demisto.params().get('proxy', False)
-
-    headers = {'Content-Type': 'application/json',
-               'x-api-key': apikey}
+    if not local_execution:
+        base_url = urljoin(demisto.params()['url'], '/cyberchef')
+        verify_certificate = not demisto.params().get('insecure', False)
+        proxy = demisto.params().get('proxy', False)
+        headers = {'Content-Type': 'application/json', 'x-api-key': apikey}
 
     demisto.info(f'Command being called is {demisto.command()}')
     try:
-        client = BaseClient(
-            base_url=base_url,
-            verify=verify_certificate,
-            headers=headers,
-            proxy=proxy)
+        if not local_execution:
+            client = BaseClient(
+                base_url=base_url,
+                verify=verify_certificate,
+                headers=headers,
+                proxy=proxy)
+        else:
+            client = None
 
         if demisto.command() == 'test-module':
             # This is the call made when pressing the integration Test button.
-            result = test_module(client)
+            result = test_module(client, local_execution)
             demisto.results(result)
         elif demisto.command() == 'cyberchef-bake':
             data = {'input': demisto.args().get('input'),
                     'recipe': json.loads(demisto.args().get('recipe')),
                     'outputType': demisto.args().get('outputType')}
             data = remove_empty_elements(data)
-            results = run_command(client, data, '/bake')
+            results = run_command(client, data, '/bake', local_execution)
             return_results(create_output(results, 'Bake'))
         elif demisto.command() == 'cyberchef-magic':
             data = {'input': demisto.args().get('input'),
                     'args': demisto.args().get('args')}
             data = remove_empty_elements(data)
-            results = run_command(client, data, '/magic')
+            results = run_command(client, data, '/magic', local_execution)
             return_results(create_output(results, 'Magic'))
     # Log exceptions
     except Exception as e:
diff --git a/Packs/CyberChef/Integrations/CyberChef/CyberChef.yml b/Packs/CyberChef/Integrations/CyberChef/CyberChef.yml
index 299688251ad2..74ab43db5d66 100644
--- a/Packs/CyberChef/Integrations/CyberChef/CyberChef.yml
+++ b/Packs/CyberChef/Integrations/CyberChef/CyberChef.yml
@@ -3,16 +3,21 @@ commonfields:
   id: CyberChef
   version: -1
 configuration:
+- display: Local execution
+  additionalinfo: Uses the [cyberchef node package](https://github.com/polarityio/cyberchef-node) for local execution of your commands
+  name: local_execution
+  required: false
+  type: 8
 - additionalinfo: URL or your CyberChef server or https://prod.apifor.io/
   display: Server URL (e.g. https://prod.apifor.io/)
   name: url
-  required: true
   type: 0
-- additionalinfo: API key if you use https://prod.apifor.io/
-  display: API Key
+  required: false
+- display: API Key
   name: apikey
   type: 4
   required: false
+  additionalinfo: API key if you use https://prod.apifor.io/
 - display: Trust any certificate (not secure)
   name: insecure
   type: 8
@@ -53,7 +58,7 @@ script:
     - contextPath: CyberChef.Magic
       description: Output of the Magic operation.
       type: string
-  dockerimage: demisto/python3:3.11.9.101916
+  dockerimage: demisto/cyberchef:1.0.0.104247
   runonce: false
   script: ''
   subtype: python3
diff --git a/Packs/CyberChef/Integrations/CyberChef/README.md b/Packs/CyberChef/Integrations/CyberChef/README.md
index 615ec2dd6bbc..1581efff1f8d 100644
--- a/Packs/CyberChef/Integrations/CyberChef/README.md
+++ b/Packs/CyberChef/Integrations/CyberChef/README.md
@@ -12,6 +12,7 @@ CyberChef is a web-application developed by GCHQ that's been called the “Cyber
     | API Key | API key if you use https://prod.apifor.io/ | False |
     | Trust any certificate (not secure) |  | False |
     | Use system proxy settings |  | False |
+    | Local execution | Uses the [cyberchef node package](https://github.com/polarityio/cyberchef-node) for local execution of your commands | False |
 
 4. Click **Test** to validate the URLs, token, and connection.
 ## Commands
diff --git a/Packs/CyberChef/ReleaseNotes/1_0_6.md b/Packs/CyberChef/ReleaseNotes/1_0_6.md
index 571c7075133a..115c1c10b8a6 100644
--- a/Packs/CyberChef/ReleaseNotes/1_0_6.md
+++ b/Packs/CyberChef/ReleaseNotes/1_0_6.md
@@ -3,4 +3,4 @@
 
 ##### CyberChef
 
-- Updated the Docker image to: *demisto/python3:3.11.9.101916*.
+- Updated the Docker image to: *demisto/python3:3.11.9.101916*.
\ No newline at end of file
diff --git a/Packs/CyberChef/ReleaseNotes/1_0_7.md b/Packs/CyberChef/ReleaseNotes/1_0_7.md
new file mode 100644
index 000000000000..f1f6c79c7399
--- /dev/null
+++ b/Packs/CyberChef/ReleaseNotes/1_0_7.md
@@ -0,0 +1,7 @@
+
+#### Integrations
+
+##### CyberChef
+
+- Updated the Docker image to: *demisto/cyberchef:1.0.0.104247*.
+- Added support for cyberchef node package as dependency to execute cyberchef locally.
diff --git a/Packs/CyberChef/pack_metadata.json b/Packs/CyberChef/pack_metadata.json
index eb6313832f7f..c32ecdbc9624 100644
--- a/Packs/CyberChef/pack_metadata.json
+++ b/Packs/CyberChef/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "CyberChef",
     "description": "Integration with your CyberChef server or https://prod.apifor.io service for CyberChef.",
     "support": "community",
-    "currentVersion": "1.0.6",
+    "currentVersion": "1.0.7",
     "author": "Harri Ruuttila",
     "url": "",
     "email": "",
diff --git a/Packs/EmailCommunication/ReleaseNotes/2_0_30.md b/Packs/EmailCommunication/ReleaseNotes/2_0_30.md
new file mode 100644
index 000000000000..fc3199e770a4
--- /dev/null
+++ b/Packs/EmailCommunication/ReleaseNotes/2_0_30.md
@@ -0,0 +1,7 @@
+
+#### Scripts
+
+##### PreprocessEmail
+
+Updated the script to handle both attachments names in the original format (e.g., image.png) and in the new format <Attachment-ID\>-attachmentName-<Attachment-name\> (e.g., 123-attachmentName-image.png).
+
diff --git a/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.py b/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.py
index 6352f3fe24ce..8a0eb3c5914f 100644
--- a/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.py
+++ b/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.py
@@ -53,7 +53,7 @@ def remove_html_conversation_history(email_html):
     return email_html
 
 
-def create_email_html(email_html='', entry_id_list=None):
+def create_email_html(email_html='', entry_id_list=[]):
     """Modify the email's html body to use entry IDs instead of CIDs and remove the original message body if exists.
     Args:
         email_html (str): The attachments of the email.
@@ -95,14 +95,21 @@ def get_entry_id_list(attachments, files, email_html):
     matches = re.findall(r'src="cid:([^"]+)"', email_html) or []
     entry_id_list = []
     files = [files] if not isinstance(files, list) else files
+    legacy_name = not any('-attachmentName-' in attachment.get('name') for attachment in attachments)
     for attachment in attachments:
         attachment_name = attachment.get('name', '')
-        if '-attachmentName-' in attachment_name:
-            identifier_id = attachment_name.split('-attachmentName-', 1)[0]
+        if not legacy_name:
+            if '-attachmentName-' in attachment_name:
+                identifier_id = attachment_name.split('-attachmentName-', 1)[0]
+                for file in files:
+                    file_name = file.get('Name')
+                    if attachment_name == file_name and identifier_id in matches:
+                        entry_id_list.append((attachment_name, file.get('EntryID')))
+        else:
             for file in files:
-                file_name = file.get('Name')
-                if attachment_name == file_name and identifier_id in matches:
+                if attachment_name == file.get('Name') and attachment.get('description', '') != FileAttachmentType.ATTACHED:
                     entry_id_list.append((attachment_name, file.get('EntryID')))
+
     return entry_id_list
 
 
@@ -221,53 +228,22 @@ def get_attachments_using_instance(email_related_incident, labels, email_to, ide
     if integration_name in ['EWS v2', 'EWSO365']:
         demisto.executeCommand("executeCommandAt",
                                {'command': 'ews-get-attachment', 'incidents': email_related_incident,
-                                'arguments': {'item-id': str(message_id),
-                                              'identifiers-filter': identifier_ids,
-                                              'using': instance_name}})
+                                'arguments': {'item-id': str(message_id), 'using': instance_name}})
 
     elif integration_name in ['Gmail', 'Gmail Single User']:
         demisto.executeCommand("executeCommandAt",
                                {'command': 'gmail-get-attachments', 'incidents': email_related_incident,
-                                'arguments': {'user-id': 'me', 'message-id': str(message_id),
-                                              'identifiers-filter': identifier_ids,
-                                              'using': instance_name}})
+                                'arguments': {'user-id': 'me', 'message-id': str(message_id), 'using': instance_name}})
 
     elif integration_name in ['MicrosoftGraphMail', 'Microsoft Graph Mail Single User']:
         demisto.executeCommand("executeCommandAt",
                                {'command': 'msgraph-mail-get-attachment', 'incidents': email_related_incident,
-                                'arguments': {'user_id': email_to, 'message_id': str(message_id),
-                                              'identifiers_filter': identifier_ids, 'using': instance_name}})
+                                'arguments': {'user_id': email_to, 'message_id': str(message_id), 'using': instance_name}})
 
     else:
         demisto.debug('Attachments could only be retrieved from EWS v2 or Gmail')
 
 
-def find_attachments_to_download(attachments, email_related_incident):
-    """ Filter only new attachment and their identifier.
-
-    Args:
-        attachments (Attachment): All attachments from the current thread mail
-        email_related_incident (str): email related incident to retrieve previous files
-        labels : labels to find the integration name
-    """
-    if attachments:
-        new_attachment_identifiers_list = ["dummyFileIdentifier"]
-        new_attachments = []
-        previous_files = get_incident_related_files(email_related_incident)
-        previous_files = [previous_files] if not isinstance(previous_files, list) else previous_files
-        previous_file_names = [file.get("Name") for file in previous_files]
-        for attachment in attachments:
-            attachment_name = attachment.get('name', '')
-            if attachment_name not in previous_file_names:
-                if new_attachment_identifiers_list == ["dummyFileIdentifier"]:
-                    new_attachment_identifiers_list = []
-                identifier_id = attachment.get('name', '').split('-attachmentName-', 1)[0]
-                new_attachment_identifiers_list.append(identifier_id)
-                new_attachments.append(attachment)
-        return ",".join(new_attachment_identifiers_list), new_attachments
-    return "", []
-
-
 def get_incident_related_files(incident_id):
     """Get the email reply attachments after they were uploaded to the server and saved
     to context of the email reply related incident.
@@ -455,11 +431,7 @@ def main():
 
         email_html = remove_html_conversation_history(email_html)
 
-        # Get attachments IDs for new attacments
-        attachment_identifiers_array, attachments = find_attachments_to_download(attachments,
-                                                                                 email_related_incident
-                                                                                 )
-        get_attachments_using_instance(email_related_incident, incident.get('labels'), email_to, attachment_identifiers_array)
+        get_attachments_using_instance(email_related_incident, incident.get('labels'), email_to)
 
         # Adding a 5 seconds sleep in order to wait for all the attachments to get uploaded to the server.
         time.sleep(5)
diff --git a/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail_test.py b/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail_test.py
index dd9d12860982..cb20b92d219c 100644
--- a/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail_test.py
+++ b/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail_test.py
@@ -288,6 +288,98 @@ def test_get_entry_id_list():
 
 
 def test_get_entry_id_list_with_attached_file():
+    """
+        Given
+        - List of the email's attachments - but one attachment is marked as ATTACHED (not inline image)
+        - List of files of the email's related incident
+        When
+        - building an entry id list in order to replace the email's attachments source path.
+        Then
+        - Ensures that the attached file (attachment_1.pdf) is excluded since it is marked as ATTACHED
+    """
+    from PreprocessEmail import get_entry_id_list
+    attachments = [
+        {
+            "description": "attached_file",
+            "name": "attachment_1.pdf",
+            "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
+            "showMediaFile": False,
+            "type": ""
+        },
+        {
+            "description": "",
+            "name": "image_1.png",
+            "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
+            "showMediaFile": False,
+            "type": ""
+        },
+        {
+            "description": "",
+            "name": "image_2.png",
+            "path": "131_17545998-4b16-4e58-8e6c-2221ada856d4",
+            "showMediaFile": False,
+            "type": ""
+        }
+    ]
+    files = [
+        {
+            "EntryID": "30@119",
+            "Extension": "pdf",
+            "Info": "application/pdf",
+            "MD5": "md5",
+            "Name": "attachment_1.pdf",
+            "SHA1": "sha1",
+            "SHA256": "sha256",
+            "SHA512": "sha512",
+            "SSDeep": "ssdeep",
+            "Size": 63111,
+            "Type": "PDF document, version 1.4"
+        },
+        {
+            "EntryID": "34@119",
+            "Extension": "png",
+            "Info": "image/png",
+            "MD5": "md5",
+            "Name": "attachment_2.png",
+            "SHA1": "4sha1",
+            "SHA256": "sha256",
+            "SHA512": "sha512",
+            "SSDeep": "ssdeep",
+            "Size": 9580,
+            "Type": "PNG image data, 264 x 60, 8-bit/color RGBA, non-interlaced"
+        },
+        {
+            "EntryID": "35@119",
+            "Extension": "png",
+            "Info": "image/png",
+            "MD5": "md5",
+            "Name": "image_1.png",
+            "SHA1": "4sha1",
+            "SHA256": "sha256",
+            "SHA512": "sha512",
+            "SSDeep": "ssdeep",
+            "Size": 9580,
+            "Type": "PNG image data, 264 x 60, 8-bit/color RGBA, non-interlaced"
+        },
+        {
+            "EntryID": "36@119",
+            "Extension": "png",
+            "Info": "image/png",
+            "MD5": "md5",
+            "Name": "image_2.png",
+            "SHA1": "4sha1",
+            "SHA256": "sha256",
+            "SHA512": "sha512",
+            "SSDeep": "ssdeep",
+            "Size": 9580,
+            "Type": "PNG image data, 264 x 60, 8-bit/color RGBA, non-interlaced"
+        }]
+    expected = [('image_1.png', '35@119'), ('image_2.png', '36@119')]
+    email_html = '<src="cid:456"><src="cid:123">'
+    assert expected == get_entry_id_list(attachments, files, email_html)
+
+
+def test_get_entry_id_list_no_attachmentName():
     """
         Given
         - List of the email's attachments - but one attachment is marked as ATTACHED (not inline image)
@@ -309,14 +401,14 @@ def test_get_entry_id_list_with_attached_file():
         },
         {
             "description": "",
-            "name": "123-attachmentName-image_1.png",
+            "name": "image_1.png",
             "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
             "showMediaFile": False,
             "type": ""
         },
         {
-            "description": "",
-            "name": "456-attachmentName-image_2.png",
+            "description": "attached_file",
+            "name": "image_2.png",
             "path": "131_17545998-4b16-4e58-8e6c-2221ada856d4",
             "showMediaFile": False,
             "type": ""
@@ -354,7 +446,7 @@ def test_get_entry_id_list_with_attached_file():
             "Extension": "png",
             "Info": "image/png",
             "MD5": "md5",
-            "Name": "123-attachmentName-image_1.png",
+            "Name": "image_1.png",
             "SHA1": "4sha1",
             "SHA256": "sha256",
             "SHA512": "sha512",
@@ -367,7 +459,7 @@ def test_get_entry_id_list_with_attached_file():
             "Extension": "png",
             "Info": "image/png",
             "MD5": "md5",
-            "Name": "456-attachmentName-image_2.png",
+            "Name": "image_2.png",
             "SHA1": "4sha1",
             "SHA256": "sha256",
             "SHA512": "sha512",
@@ -375,7 +467,7 @@ def test_get_entry_id_list_with_attached_file():
             "Size": 9580,
             "Type": "PNG image data, 264 x 60, 8-bit/color RGBA, non-interlaced"
         }]
-    expected = [('123-attachmentName-image_1.png', '35@119'), ('456-attachmentName-image_2.png', '36@119')]
+    expected = [('attachment_1.pdf', '30@119'), ('image_1.png', '35@119')]
     email_html = '<src="cid:456"><src="cid:123">'
     assert expected == get_entry_id_list(attachments, files, email_html)
 
@@ -652,7 +744,6 @@ def test_main_untagged_email(mocker):
     Then
     - Validate that no relevant incident was created
     """
-
     from PreprocessEmail import main
     mocker.patch.object(demisto, 'incident', return_value={'CustomFields': {}})
     mocker.patch.object(demisto, 'args', return_value={"CreateIncidentUntaggedEmail": False})
@@ -669,18 +760,18 @@ def test_main_untagged_email(mocker):
     [
         ([{'type': 'Email/ID', 'value': 'foo@test.com'}, {'type': 'Instance', 'value': 'ews'},
           {'type': 'Brand', 'value': 'EWSO365'}], 'test@test.com',
-         {'arguments': {'item-id': 'foo@test.com', 'identifiers-filter': '', 'using': 'ews'},
+         {'arguments': {'item-id': 'foo@test.com', 'using': 'ews'},
           'command': 'ews-get-attachment', 'incidents': None}
          ),
         ([{'type': 'Email/ID', 'value': 'foo@test.com'}, {'type': 'Instance', 'value': 'gmail'},
           {'type': 'Brand', 'value': 'Gmail'}], 'test@gmail.com',
-         {'arguments': {'message-id': 'foo@test.com', 'user-id': 'me', 'identifiers-filter': '', 'using': 'gmail'},
+         {'arguments': {'message-id': 'foo@test.com', 'user-id': 'me', 'using': 'gmail'},
           'command': 'gmail-get-attachments', 'incidents': None}
          ),
         ([{'type': 'Email/ID', 'value': 'foo@outlook.com'}, {'type': 'Instance', 'value': 'MicrosoftGraphMail'},
           {'type': 'Brand', 'value': 'MicrosoftGraphMail'}], 'test@outlook.com',
          {'command': 'msgraph-mail-get-attachment', 'incidents': None,
-         'arguments': {'user_id': 'test@outlook.com', 'message_id': 'foo@outlook.com', 'identifiers_filter': '',
+         'arguments': {'user_id': 'test@outlook.com', 'message_id': 'foo@outlook.com',
                        'using': 'MicrosoftGraphMail'}}
          ),
     ]
@@ -693,6 +784,20 @@ def test_get_attachments_using_instance(labels, email_to, result, mocker):
 
 
 ATTACHMENTS = [{
+    "description": "",
+    "name": "image_1.png",
+            "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
+            "showMediaFile": False,
+            "type": ""
+}, {
+    "description": "",
+    "name": "image_2.png",
+            "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
+            "showMediaFile": False,
+            "type": ""
+}]
+
+ATTACHMENTS_2 = [{
     "description": "",
     "name": "123-attachmentName-image_1.png",
             "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
@@ -704,6 +809,12 @@ def test_get_attachments_using_instance(labels, email_to, result, mocker):
             "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
             "showMediaFile": False,
             "type": ""
+}, {
+    "description": "",
+    "name": "image_3.png",
+            "path": "131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215",
+            "showMediaFile": False,
+            "type": ""
 }]
 
 FILES_TEST1 = [{
@@ -711,7 +822,7 @@ def test_get_attachments_using_instance(labels, email_to, result, mocker):
     "Extension": "png",
     "Info": "image/png",
     "MD5": "605ebf7bc83a00840a3ea90c8ed56515",
-    "Name": "123-attachmentName-image_1.png",
+    "Name": "image_1.png",
     "SHA1": "SHA1",
     "SHA256": "SHA256",
     "SHA512": "SHA512",
@@ -723,7 +834,7 @@ def test_get_attachments_using_instance(labels, email_to, result, mocker):
     "Extension": "png",
     "Info": "image/png",
     "MD5": "605ebf7bc83a00840a3ea90c8ed56515",
-    "Name": "456-attachmentName-image_2.png",
+    "Name": "image_2.png",
     "SHA1": "SHA1",
     "SHA256": "SHA256",
     "SHA512": "SHA512",
@@ -732,7 +843,7 @@ def test_get_attachments_using_instance(labels, email_to, result, mocker):
     "Type": "PNG image data, 275 x 184, 8-bit/color RGBA, non-interlaced"
 }]
 
-FILES_TEST2 = {
+FILES_TEST2 = [{
     "EntryID": "4@131",
     "Extension": "png",
     "Info": "image/png",
@@ -744,46 +855,157 @@ def test_get_attachments_using_instance(labels, email_to, result, mocker):
     "SSDeep": "SSDeep",
     "Size": 127884,
     "Type": "PNG image data, 275 x 184, 8-bit/color RGBA, non-interlaced"
-}
-
-FILES_TEST3 = {}
+}, {
+    "EntryID": "5@131",
+    "Extension": "png",
+    "Info": "image/png",
+    "MD5": "605ebf7bc83a00840a3ea90c8ed56515",
+    "Name": "456-attachmentName-image_2.png",
+    "SHA1": "SHA1",
+    "SHA256": "SHA256",
+    "SHA512": "SHA512",
+    "SSDeep": "SSDeep",
+    "Size": 127884,
+    "Type": "PNG image data, 275 x 184, 8-bit/color RGBA, non-interlaced"
+}, {
+    "EntryID": "5@131",
+    "Extension": "png",
+    "Info": "image/png",
+    "MD5": "605ebf7bc83a00840a3ea90c8ed56515",
+    "Name": "image_3.png",
+    "SHA1": "SHA1",
+    "SHA256": "SHA256",
+    "SHA512": "SHA512",
+    "SSDeep": "SSDeep",
+    "Size": 127884,
+    "Type": "PNG image data, 275 x 184, 8-bit/color RGBA, non-interlaced"
+}]
 
 
 @pytest.mark.parametrize(
-    "attachments, email_related_incident, files, expected_result",
+    "attachments, files, html, expected_result",
     [
-        (ATTACHMENTS, 'test@gmail.com', FILES_TEST1, ('dummyFileIdentifier', [])),
-        (ATTACHMENTS, 'test@gmail.com', FILES_TEST2, ('456', [{'description': '', 'name': '456-attachmentName-image_2.png',
-                                                               'path': '131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215',
-                                                               'showMediaFile': False, 'type': ''}])),
-        (ATTACHMENTS, 'test@gmail.com', FILES_TEST3, ('123,456', [{'description': '',
-                                                                   'name': '123-attachmentName-image_1.png',
-                                                                   'path': '131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215',
-                                                                   'showMediaFile': False, 'type': ''},
-                                                                  {'description': '',
-                                                                   'name': '456-attachmentName-image_2.png',
-                                                                   'path': '131_dd98957a-d5c3-42e0-8a81-f3ce7fa68215',
-                                                                   'showMediaFile': False, 'type': ''}])),
+        (ATTACHMENTS, FILES_TEST1, "", [('image_1.png', '4@131'), ('image_2.png', '5@131')]),
+        (
+            ATTACHMENTS_2, FILES_TEST2, """<!DOCTYPE html>
+<html>
+<head>
+    <title>Inline Images</title>
+</head>
+<body>
+    <h1>Hello, World!</h1>
+    <p>This is a test email with inline images.</p>
+    <img src="cid:123" alt="Inline Image 1">
+    <img src="cid:456" alt="Inline Image 2">
+</body>
+</html>""",
+            [('123-attachmentName-image_1.png', '4@131'), ('456-attachmentName-image_2.png', '5@131')]
+        )
     ]
 )
-def test_find_attachments_to_download(attachments, email_related_incident, files, expected_result, mocker):
+def test_get_entry_id_list_only_attachments(attachments, files, html, expected_result):
     """
-    Test case to find attachments to download based on different scenarios.
-
-    Given:
-        - Attachments of the incident.
-        - Email which is related to the incident.
+    Given
+    - case 1: all attachments are attached or in the original (plain) format.
+    - case 2: 2 attachments in the new format (<ID>-attachmentName-<Name>) 1 attachment attached.
+    When
+    - running get_entry_id_list.
+    Then
+    - case 1: returns the two original entry IDs.
+    - case 2: return only the new formatted attachments - as they should be replaced in the html.
+    """
+    from PreprocessEmail import get_entry_id_list
+    assert get_entry_id_list(attachments, files, html) == expected_result
 
-    When:
-        - Scenario 1: no new images.
-        - Scenario 2: one new image.
-        - Scenario 3: all images are new.
 
-    Then:
-        - Return the corresponding amount of entry IDs.
+@pytest.mark.parametrize(
+    "html, entry_id_list, expected_result",
+    [
+        (
+            """<!DOCTYPE html>
+<html>
+<head>
+    <title>Inline Images</title>
+</head>
+<body>
+    <h1>Hello, World!</h1>
+    <p>This is a test email with inline images.</p>
+    <img src="cid:123" alt="image_1.png">
+</body>
+</html>""",
+            [('123-attachmentName-image_1.png', '4@131'), ('image_2.png', '5@131')],
+            """<!DOCTYPE html>
+<html>
+<head>
+    <title>Inline Images</title>
+</head>
+<body>
+    <h1>Hello, World!</h1>
+    <p>This is a test email with inline images.</p>
+    <img src=entry/download/4@131 alt="image_1.png">
+</body>
+</html>"""
+        ),
+        (
+            """<!DOCTYPE html>
+<html>
+<head>
+    <title>Inline Images</title>
+</head>
+<body>
+    <h1>Hello, World!</h1>
+    <p>This is a test email with inline images.</p>
+    <img src="cid:123" alt="image_1.png">
+</body>
+</html>""",
+            [('image_1.png', '4@131'), ('image_2.png', '5@131')],
+            """<!DOCTYPE html>
+<html>
+<head>
+    <title>Inline Images</title>
+</head>
+<body>
+    <h1>Hello, World!</h1>
+    <p>This is a test email with inline images.</p>
+    <img src=entry/download/4@131 alt="image_1.png">
+</body>
+</html>"""
+        ),
+        (
+            """<!DOCTYPE html>
+<html>
+<head>
+    <title>Inline Images</title>
+</head>
+<body>
+    <h1>Hello, World!</h1>
+    <p>This is a test email with inline images.</p>
+</body>
+</html>""",
+            [('image_1.png', '4@131'), ('image_2.png', '5@131')],
+            """<!DOCTYPE html>
+<html>
+<head>
+    <title>Inline Images</title>
+</head>
+<body>
+    <h1>Hello, World!</h1>
+    <p>This is a test email with inline images.</p>
+</body>
+</html>"""
+        )
+    ]
+)
+def test_create_email_html_no_image_to_insert(html, entry_id_list, expected_result):
     """
-    import PreprocessEmail
-    mocker.patch.object(PreprocessEmail, 'get_incident_related_files', return_value=files)
-    result = PreprocessEmail.find_attachments_to_download(attachments, email_related_incident)
-    assert result[0] == expected_result[0]
-    assert result[1] == expected_result[1]
+    Given
+    - case 1: one image to replace in html with new name format.
+    - case 2: one image to replace in html with old name format.
+    - case 3: no images to replace.
+    When
+    - running create_email_html.
+    Then
+    returns the expected html.
+    """
+    from PreprocessEmail import create_email_html
+    assert create_email_html(html, entry_id_list) == expected_result
diff --git a/Packs/EmailCommunication/pack_metadata.json b/Packs/EmailCommunication/pack_metadata.json
index f7f4adcd99e6..57a1eec31b8a 100644
--- a/Packs/EmailCommunication/pack_metadata.json
+++ b/Packs/EmailCommunication/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Email Communication",
     "description": "Do you have to send multiple emails to end users? This content pack helps you streamline the process and automate updates, notifications and more.\n",
     "support": "xsoar",
-    "currentVersion": "2.0.29",
+    "currentVersion": "2.0.30",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "videos": [
diff --git a/Packs/FeedGitHub/Integrations/FeedGitHub/FeedGitHub.yml b/Packs/FeedGitHub/Integrations/FeedGitHub/FeedGitHub.yml
index fdf410b67c19..d80c63c3538a 100644
--- a/Packs/FeedGitHub/Integrations/FeedGitHub/FeedGitHub.yml
+++ b/Packs/FeedGitHub/Integrations/FeedGitHub/FeedGitHub.yml
@@ -151,7 +151,7 @@ script:
       name: limit
     description: Gets indicators from the feed within a specified date range and up to a maximum limit..
     name: github-get-indicators
-  dockerimage: demisto/taxii2:1.0.0.98729
+  dockerimage: demisto/taxii2:1.0.0.105766
   feed: true
   isfetch: false
   longRunning: false
@@ -167,4 +167,3 @@ marketplaces:
 - marketplacev2
 tests:
 - No tests (auto formatted)
-
diff --git a/Packs/FeedGitHub/ReleaseNotes/1_0_4.md b/Packs/FeedGitHub/ReleaseNotes/1_0_4.md
new file mode 100644
index 000000000000..91385cf0a373
--- /dev/null
+++ b/Packs/FeedGitHub/ReleaseNotes/1_0_4.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### Github Feed
+
+- Updated the Docker image to: *demisto/taxii2:1.0.0.105766*.
diff --git a/Packs/FeedGitHub/ReleaseNotes/1_0_5.md b/Packs/FeedGitHub/ReleaseNotes/1_0_5.md
new file mode 100644
index 000000000000..157b6188b5e9
--- /dev/null
+++ b/Packs/FeedGitHub/ReleaseNotes/1_0_5.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### Github Feed
+
+- Documentation and metadata improvements.
diff --git a/Packs/FeedGitHub/pack_metadata.json b/Packs/FeedGitHub/pack_metadata.json
index c28a0fa44da8..d4972dc15bb8 100644
--- a/Packs/FeedGitHub/pack_metadata.json
+++ b/Packs/FeedGitHub/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "GitHub Feed",
     "description": "A feed to ingest indicators of compromise from Github repositories. The feed supports general extraction of IOCs, extracting from STIX data format and parsing of YARA Rules out of the box.",
     "support": "xsoar",
-    "currentVersion": "1.0.3",
+    "currentVersion": "1.0.5",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/Flashpoint/Integrations/Ignite/README.md b/Packs/Flashpoint/Integrations/Ignite/README.md
index 75adecbe0eb3..6d3a59fd6c34 100644
--- a/Packs/Flashpoint/Integrations/Ignite/README.md
+++ b/Packs/Flashpoint/Integrations/Ignite/README.md
@@ -760,7 +760,7 @@ Retrieves a list of alerts based on the filter values provided in the command ar
 >### Alerts
 >|ID|Created at (UTC)|Query|Source|Resource URL|Site Title|Shodan Host|Repository|Owner|Origin|Ports|Services|Highlight Text|
 >|---|---|---|---|---|---|---|---|---|---|---|---|---|
->| 00000000-0000-0000-0000-000000000001 | Jun 17, 2024  05:54 | facebook | data_exposure__github | [https://dummyurl.com/naive-gabrie-white](https://dummyurl.com/naive-gabrie-white) |  |  | naive-gabrie-white.github.io | naive-gabrie-white | searches |  |  | data\-image="https://i.dummyurl.net/2021/02/24/000000000000001.png" data\-sites="<x\-fp\-highlight>facebook</x\-fp\-highlight>,twitter,wechat,weibo,qq"></div><link rel="stylesheet" href="https:... |
+>| 00000000-0000-0000-0000-000000000001 | Jun 17, 2024  05:54 | facebook | data_exposure__github | [https://dummyurl.com/naive-gabrie-white](https://dummyurl.com/naive-gabrie-white) |  |  | naive-gabrie-white.github.io | naive-gabrie-white | searches |  |  | data\-image="https://i.dummyurl.net/2021/02/24/000000000000001.png" data\-sites="<x\-fp\-highlight>facebook</x\-fp\-highlight>,twitter,wechat,weibo,qq"><link rel="stylesheet" href="https:...> |
 >| 00000000-0000-0000-0000-000000000005 | Jul 02, 2024  16:43 | 0.0.0.1 |  |  |  | ***asn***: AS0001<br>***country***: United States<br>***org***: Company LLC<br>***shodan_url***: [https://www.shodan.io/host/0.0.0.1](https://www.shodan.io/host/0.0.0.1) |  |  | assets | 53, 443 | Unknown Service (Port 01), Unknown Service (Port 02) | <x\-fp\-highlight>53</x\-fp\-highlight> |
 >
 >#### To retrieve the next set of result use,
diff --git a/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.py b/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.py
index 87ccf001b5c8..2a5fc2e3da6a 100644
--- a/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.py
+++ b/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.py
@@ -114,7 +114,7 @@ def get_token_request(self) -> tuple[str, str]:
             'password': self.password,
         }
         token_response = self._http_request('POST', url_suffix='/auth/refresh-token', headers=headers)
-        return token_response.get('access_token'), token_response.get('access_expires_in')
+        return token_response.get('access_token'), token_response.get('access_token_expires_in')
 
     def get_incidents(self, from_date, to_date) -> Any:
         return self.http_request(
diff --git a/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.yml b/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.yml
index d72677c65e9e..1693abd4b804 100644
--- a/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.yml
+++ b/Packs/ForcepointDLP/Integrations/ForcepointEventCollector/ForcepointEventCollector.yml
@@ -41,7 +41,7 @@ configuration:
   section: Connect
   advanced: true
 description: Use this integration to fetch security incidents from Forcepoint DLP as Cortex XSIAM events.
-display: Forcepoint DLP (Beta) Event Collector
+display: Forcepoint DLP Event Collector (Beta)
 name: Forcepoint DLP Event Collector
 beta: true
 script:
@@ -72,7 +72,7 @@ script:
       required: true
     description: Gets security events from Forcepoint DLP.
     name: forcepoint-dlp-get-events
-  dockerimage: demisto/python3:3.10.14.99865
+  dockerimage: demisto/python3:3.11.9.105369
   isfetchevents: true
   runonce: false
   script: ''
diff --git a/Packs/ForcepointDLP/ReleaseNotes/1_0_9.md b/Packs/ForcepointDLP/ReleaseNotes/1_0_9.md
new file mode 100644
index 000000000000..2fc0709f0ffd
--- /dev/null
+++ b/Packs/ForcepointDLP/ReleaseNotes/1_0_9.md
@@ -0,0 +1,7 @@
+
+#### Integrations
+
+##### Forcepoint DLP Event Collector (Beta)
+
+- Fixed an issue where the integration could not use the access token.
+- Updated the Docker image to: *demisto/python3:3.11.9.105369*.
diff --git a/Packs/ForcepointDLP/pack_metadata.json b/Packs/ForcepointDLP/pack_metadata.json
index dcbe94f22ed0..f01eb4ba99ba 100644
--- a/Packs/ForcepointDLP/pack_metadata.json
+++ b/Packs/ForcepointDLP/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Forcepoint DLP",
     "description": "Forcepoint DLP event collector",
     "support": "xsoar",
-    "currentVersion": "1.0.8",
+    "currentVersion": "1.0.9",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/Gmail/Integrations/Gmail/Gmail.py b/Packs/Gmail/Integrations/Gmail/Gmail.py
index 4bb3015f7952..24370dd6f78e 100644
--- a/Packs/Gmail/Integrations/Gmail/Gmail.py
+++ b/Packs/Gmail/Integrations/Gmail/Gmail.py
@@ -44,6 +44,7 @@
 PROXY = demisto.params().get('proxy')
 DISABLE_SSL = demisto.params().get('insecure', False)
 FETCH_TIME = demisto.params().get('fetch_time', '1 days')
+LEGACY_NAME = argToBoolean(demisto.params().get('legacy_name', False))
 
 SEND_AS_SMTP_FIELDS = ['host', 'port', 'username', 'password', 'securitymode']
 DATE_FORMAT = '%Y-%m-%d'  # sample - 2020-08-23
@@ -183,16 +184,20 @@ def parse_mail_parts(parts):
                 body += text
 
         else:
-            if part['body'].get('attachmentId') is not None and part.get('headers'):
-                identifier_id = ""
-                for header in part['headers']:
+            if part['body'].get('attachmentId') is not None:
+                attachmentName = part['filename']
+                content_id = ""
+                is_inline = False
+                for header in part.get('headers', []):
                     if header.get('name') == 'Content-ID':
-                        identifier_id = header.get('value').strip("<>")
-                    if not identifier_id or identifier_id == "None":
-                        identifier_id = part['body'].get('attachmentId').strip("<>")
+                        content_id = header.get('value').strip("<>")
+                    if header.get('name') == 'Content-Disposition':
+                        is_inline = 'inline' in header.get('value').strip('<>')
+                if is_inline and content_id and content_id != "None" and not LEGACY_NAME:
+                    attachmentName = f"{content_id}-attachmentName-{attachmentName}"
                 attachments.append({
                     'ID': part['body']['attachmentId'],
-                    'Name': f"{identifier_id}-attachmentName-{part['filename']}",
+                    'Name': attachmentName,
                 })
 
     return body, html, attachments
@@ -1526,14 +1531,13 @@ def get_attachments_command():
     args = demisto.args()
     user_id = args.get('user-id')
     _id = args.get('message-id')
-    identifiers_filter = args.get('identifiers-filter', "")
 
-    attachments = get_attachments(user_id, _id, identifiers_filter)
+    attachments = get_attachments(user_id, _id)
 
     return [fileResult(name, data) for name, data in attachments]
 
 
-def get_attachments(user_id, _id, identifiers_filter=""):
+def get_attachments(user_id, _id):
     mail_args = {
         'userId': user_id,
         'id': _id,
@@ -1553,14 +1557,10 @@ def get_attachments(user_id, _id, identifiers_filter=""):
     }
     files = []
     for attachment in result.get('Attachments', []):
-        identifiers_filter_array = argToList(identifiers_filter)
         command_args['id'] = attachment['ID']
         result = service.users().messages().attachments().get(**command_args).execute()
-        if (not identifiers_filter_array
-                or ('-attachmentName-' in attachment['Name']
-                    and attachment['Name'].split('-attachmentName-')[0] in identifiers_filter_array)):
-            file_data = base64.urlsafe_b64decode(result['data'].encode('ascii'))
-            files.append((attachment['Name'], file_data))
+        file_data = base64.urlsafe_b64decode(result['data'].encode('ascii'))
+        files.append((attachment['Name'], file_data))
     return files
 
 
diff --git a/Packs/Gmail/Integrations/Gmail/Gmail.yml b/Packs/Gmail/Integrations/Gmail/Gmail.yml
index 7994a7f6fc5e..1044b7b9ab65 100644
--- a/Packs/Gmail/Integrations/Gmail/Gmail.yml
+++ b/Packs/Gmail/Integrations/Gmail/Gmail.yml
@@ -69,6 +69,12 @@ configuration:
   section: Collect
   additionalinfo: A maximum of 200 emails per fetch (even if a higher number is configured). The default is 50.
   required: false
+- display: Use legacy attachment name
+  name: legacy_name
+  section: Collect
+  type: 8
+  advanced: true
+  defaultvalue: 'false'
 description: Gmail API and user management (This integration replaces the Gmail functionality in the GoogleApps API and G Suite integration).
 display: Gmail
 name: Gmail
@@ -205,10 +211,6 @@ script:
     - description: The user's email address. The "me" special value can be used to indicate the authenticated user.
       name: user-id
       required: true
-    - description: Identifier ids to download to XSOAR (to avoid downloading all files to XSOAR during the preprocessing script).
-      name: identifiers-filter
-      required: false
-      hidden: true
     description: Retrieves attachments from a sent Gmail message.
     name: gmail-get-attachments
     outputs:
diff --git a/Packs/Gmail/Integrations/Gmail/Gmail_test.py b/Packs/Gmail/Integrations/Gmail/Gmail_test.py
index 05f914c9cc8a..d3bab63599e3 100644
--- a/Packs/Gmail/Integrations/Gmail/Gmail_test.py
+++ b/Packs/Gmail/Integrations/Gmail/Gmail_test.py
@@ -991,7 +991,7 @@ def test_handle_html_image_with_new_line(mocker):
     [
         (part_test1, ('', '', [{'ID': '1234', 'Name': '5678-attachmentName-image-1.png'}])),
         (part_test2, ('', '', [{'ID': '1234', 'Name': '5678-attachmentName-image-1.png'}])),
-        (part_test3, ('', '', [{'ID': '1234', 'Name': '1234-attachmentName-image-1.png'}])),
+        (part_test3, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
     ],
 )
 def test_parse_mail_parts(part, expected_result):
@@ -1006,3 +1006,26 @@ def test_parse_mail_parts(part, expected_result):
     from Gmail import parse_mail_parts
     result = parse_mail_parts(part)
     assert result == expected_result
+
+
+@pytest.mark.parametrize(
+    "part, expected_result",
+    [
+        (part_test1, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
+        (part_test2, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
+        (part_test3, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
+    ],
+)
+def test_parse_mail_parts_use_legacy_name(monkeypatch, part, expected_result):
+    """
+    Given:
+        - Part of message from Gmail API response.
+    When:
+        - Run parse_mail_parts function LEGACY_NAME is true.
+    Then:
+        - Ensure attachment's name was correctly constructed and parsing was correctly done.
+    """
+    from Gmail import parse_mail_parts
+    monkeypatch.setattr('Gmail.LEGACY_NAME', True)
+    result = parse_mail_parts(part)
+    assert result == expected_result
diff --git a/Packs/Gmail/ReleaseNotes/1_3_22.md b/Packs/Gmail/ReleaseNotes/1_3_22.md
new file mode 100644
index 000000000000..87695e6d23d6
--- /dev/null
+++ b/Packs/Gmail/ReleaseNotes/1_3_22.md
@@ -0,0 +1,7 @@
+
+#### Integrations
+
+##### Gmail
+
+- Added a Use Legacy Name configuration parameter in order to use the original attachment name.
+- Updated the attachment name to be in the following format: <the attachment ID\>-attachmentName-<the attachment name\> only if the attachment is inline and **Use Legacy Name** is disabled.
diff --git a/Packs/Gmail/pack_metadata.json b/Packs/Gmail/pack_metadata.json
index 962913feb018..3d001a3627d0 100644
--- a/Packs/Gmail/pack_metadata.json
+++ b/Packs/Gmail/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Gmail",
     "description": "Gmail API and user management (This integration replaces the Gmail functionality in the GoogleApps API and G Suite integration).",
     "support": "xsoar",
-    "currentVersion": "1.3.21",
+    "currentVersion": "1.3.22",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.py b/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.py
index a74e39b09a05..e53e4df7f78a 100644
--- a/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.py
+++ b/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.py
@@ -40,6 +40,7 @@
 MAX_FETCH = int(params.get('fetch_limit') or 50)
 AUTH_CODE = params.get('auth_code_creds', {}).get('password') or params.get('code')
 AUTH_CODE_UNQUOTE_PREFIX = 'code='
+LEGACY_NAME = argToBoolean(params.get('legacy_name', False))
 
 OOB_CLIENT_ID = "391797357217-pa6jda1554dbmlt3hbji2bivphl0j616.apps.googleusercontent.com"  # guardrails-disable-line
 CLIENT_ID = params.get('credentials', {}).get('identifier') or params.get('client_id') or OOB_CLIENT_ID
@@ -307,22 +308,25 @@ def parse_mail_parts(self, parts: list[dict]):
                     body += text
 
             else:
-                if part['body'].get('attachmentId') is not None and part.get('headers'):
-                    identifier_id = ""
-                    for header in part['headers']:
+                if part['body'].get('attachmentId') is not None:
+                    content_id = ""
+                    is_inline = False
+                    attachmentName = part['filename']
+                    for header in part.get('headers', []):
                         if header.get('name') == 'Content-ID':
-                            identifier_id = header.get('value')
-                            if not identifier_id or identifier_id == "None":
-                                identifier_id = part['body'].get('attachmentId')
-                            identifier_id = identifier_id.strip("<>")
+                            content_id = header.get('value').strip("<>")
+                        if header.get('name') == 'Content-Disposition':
+                            is_inline = 'inline' in header.get('value').strip('<>')
+                    if is_inline and content_id and content_id != "None" and not LEGACY_NAME:
+                        attachmentName = f"{content_id}-attachmentName-{attachmentName}"
                     attachments.append({
                         'ID': part['body']['attachmentId'],
-                        'Name': f"{identifier_id}-attachmentName-{part['filename']}",
+                        'Name': attachmentName,
                     })
 
         return body, html, attachments
 
-    def get_attachments(self, user_id, _id, identifiers_filter=""):
+    def get_attachments(self, user_id, _id):
         mail_args = {
             'userId': user_id,
             'id': _id,
@@ -340,14 +344,10 @@ def get_attachments(self, user_id, _id, identifiers_filter=""):
         }
         files = []
         for attachment in result.get('Attachments', []):
-            identifiers_filter_array = argToList(identifiers_filter)
             command_args['id'] = attachment['ID']
             result = execute_gmail_action(service, "get_attachments", command_args)
-            if (not identifiers_filter_array
-                or ('-attachmentName-' in attachment['Name']
-                    and attachment['Name'].split('-attachmentName-')[0] in identifiers_filter_array)):
-                file_data = base64.urlsafe_b64decode(result['data'].encode('ascii'))
-                files.append((attachment['Name'], file_data))
+            file_data = base64.urlsafe_b64decode(result['data'].encode('ascii'))
+            files.append((attachment['Name'], file_data))
         return files
 
     @staticmethod
@@ -1136,9 +1136,8 @@ def reply_mail_command(client: Client):
 def get_attachments_command(client: Client):
     args = demisto.args()
     _id = args.get('message-id')
-    content_ids = args.get('identifiers-filter', "")
 
-    attachments = client.get_attachments('me', _id, content_ids)
+    attachments = client.get_attachments('me', _id)
 
     return [fileResult(name, data) for name, data in attachments]
 
diff --git a/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.yml b/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.yml
index 2ad0bee222e8..61a57faf35ba 100644
--- a/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.yml
+++ b/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser.yml
@@ -114,6 +114,12 @@ configuration:
   section: Connect
   advanced: true
   required: false
+- display: Use legacy attachment name
+  name: legacy_name
+  section: Collect
+  type: 8
+  advanced: true
+  defaultvalue: 'false'
 description: Gmail API using OAuth 2.0.
 display: Gmail Single User
 name: Gmail Single User
@@ -346,10 +352,6 @@ script:
     - description: The ID of the message to retrieve.
       name: message-id
       required: true
-    - description: Identifier ids to download to XSOAR (to avoid downloading all files to XSOAR during the preprocessing script).
-      name: identifiers-filter
-      required: false
-      hidden: true
     description: Retrieves attachments from a sent Gmail message.
     name: gmail-get-attachments
   dockerimage: demisto/google-api-py3:1.0.0.98645
diff --git a/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser_test.py b/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser_test.py
index f4337201d6f8..fd28ebb4eedb 100644
--- a/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser_test.py
+++ b/Packs/GmailSingleUser/Integrations/GmailSingleUser/GmailSingleUser_test.py
@@ -516,7 +516,7 @@ def test_handle_html_image_with_new_line(mocker):
     'filename': 'image-1.png',
     'headers': [{
         'name': 'Content-ID', 'value': '5678'},
-        {'name': 'Content-Disposition', 'value': 'inline'}],
+        {'name': 'Content-Disposition', 'value': 'attachment'}],
     'body': {
         'attachmentId': '1234'},
     'mimeType': ''
@@ -537,8 +537,8 @@ def test_handle_html_image_with_new_line(mocker):
     "part, expected_result",
     [
         (part_test1, ('', '', [{'ID': '1234', 'Name': '5678-attachmentName-image-1.png'}])),
-        (part_test2, ('', '', [{'ID': '1234', 'Name': '5678-attachmentName-image-1.png'}])),
-        (part_test3, ('', '', [{'ID': '1234', 'Name': '1234-attachmentName-image-1.png'}])),
+        (part_test2, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
+        (part_test3, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
     ],
 )
 def test_parse_mail_parts(part, expected_result):
@@ -546,10 +546,33 @@ def test_parse_mail_parts(part, expected_result):
     Given:
         - Part of message from Gmail API response.
     When:
-        - Run parse_mail_parts function.
+        - Run parse_mail_parts function with LEGACY_NAME is false.
+    Then:
+        - Ensure attachment's name was correctly constructed and parsing was correctly done.
+    """
+    client = Client()
+    result = client.parse_mail_parts(part)
+    assert result == expected_result
+
+
+@pytest.mark.parametrize(
+    "part, expected_result",
+    [
+        (part_test1, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
+        (part_test2, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
+        (part_test3, ('', '', [{'ID': '1234', 'Name': 'image-1.png'}])),
+    ],
+)
+def test_parse_mail_parts_use_legacy_name(monkeypatch, part, expected_result):
+    """
+    Given:
+        - Part of message from Gmail API response.
+    When:
+        - Run parse_mail_parts function LEGACY_NAME is true.
     Then:
         - Ensure attachment's name was correctly constructed and parsing was correctly done.
     """
     client = Client()
+    monkeypatch.setattr('GmailSingleUser.LEGACY_NAME', True)
     result = client.parse_mail_parts(part)
     assert result == expected_result
diff --git a/Packs/GmailSingleUser/ReleaseNotes/1_4_3.md b/Packs/GmailSingleUser/ReleaseNotes/1_4_3.md
new file mode 100644
index 000000000000..b5feb94348a4
--- /dev/null
+++ b/Packs/GmailSingleUser/ReleaseNotes/1_4_3.md
@@ -0,0 +1,7 @@
+
+#### Integrations
+
+##### Gmail Single User
+
+- Added a Use Legacy Name configuration parameter in order to use the original attachment name.
+- Updated the attachment name to be in the following format: <the attachment ID\>-attachmentName-<the attachment name\> only if the attachment is inline and **Use Legacy Name** is disabled.
\ No newline at end of file
diff --git a/Packs/GmailSingleUser/pack_metadata.json b/Packs/GmailSingleUser/pack_metadata.json
index b406eeae0e6b..a4fad5b582ab 100644
--- a/Packs/GmailSingleUser/pack_metadata.json
+++ b/Packs/GmailSingleUser/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Gmail Single User",
     "description": "Gmail API using OAuth 2.0.",
     "support": "xsoar",
-    "currentVersion": "1.4.2",
+    "currentVersion": "1.4.3",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/GoogleThreatIntelligence/README.md b/Packs/GoogleThreatIntelligence/README.md
index 420b0e864813..8d8dcf23cc57 100644
--- a/Packs/GoogleThreatIntelligence/README.md
+++ b/Packs/GoogleThreatIntelligence/README.md
@@ -35,8 +35,8 @@ Security team challenges | Solving with Google Threat Intelligence + XSOAR
 - Is a vulnerability (CVE) that appeared in my environment being currently leveraged by malware? How popular is it?
 
 **Technical capabilities**
-- Threat reputation for {files, hashes, domains, IPs, URLs} coming from [over 90 security vendors](https://support.virustotal.com/hc/en-us/articles/115002146809-Contributors) (antivirus solutions, nextgen EDRs, domain blocklists, network perimeter solutions, etc.).
-- Multi-angular detection for files via crowdsourced {[YARA](https://virustotal.github.io/yara/), [SIGMA](https://blog.virustotal.com/2021/05/context-is-king-part-i-crowdsourced.html), [IDS](https://support.virustotal.com/hc/en-us/articles/360018436078-Crowdsourced-IDS-Rules)} rules.
+- Threat reputation for {files, hashes, domains, IPs, URLs} coming from [over 90 security vendors](https://docs.virustotal.com/docs/contributors) (antivirus solutions, nextgen EDRs, domain blocklists, network perimeter solutions, etc.).
+- Multi-angular detection for files via crowdsourced {[YARA](https://virustotal.github.io/yara/), [SIGMA](https://blog.virustotal.com/2021/05/context-is-king-part-i-crowdsourced.html), [IDS](https://docs.virustotal.com/docs/crowdsourced-ids-rules)} rules.
 - Allowlist (benign) information through the [aggregation of goodware indicators and provenance details](https://blog.virustotal.com/2021/08/introducing-known-distributors.html).
 - Dynamic analysis for files through detonation in [multiple home-grown and 3rd-party partner](https://blog.virustotal.com/search/label/multisandbox) sandbox solutions.
 - Extended file context and metadata through static analysis tools such as sigcheck’s authenticode signature extractor, MS Office macro VBA dissectors, Didier Stevens’ PDF tools, etc.
diff --git a/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.py b/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.py
index c2c57e77cedf..7f6e0d956c0c 100644
--- a/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.py
+++ b/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.py
@@ -1,15 +1,15 @@
 import demistomock as demisto  # noqa: F401
 from CommonServerPython import *  # noqa: F401
 
-from CommonServerUserPython import *
 
 ''' IMPORTS '''
 
-import dateparser
 import json
 import traceback
+from datetime import datetime, timedelta
+
+import dateparser
 import urllib3
-from datetime import timedelta, datetime
 
 # Disable insecure warnings
 urllib3.disable_warnings()
@@ -302,7 +302,7 @@ def get_livesearches(self):
             data=data
         )
 
-    def get_search_id(self, query, time_range, limit=100, repos=[]):
+    def get_search_id(self, query, time_range, limit=100, repos=[], timeout=60):
         """
         :param query: LogPoint search query
 
@@ -312,6 +312,8 @@ def get_search_id(self, query, time_range, limit=100, repos=[]):
 
         :param repos: LogPoint repos from where logs should be fetched
 
+        :param timeout: LogPoint search timeout
+
         :return: dict containing response from API call
         """
         data = {
@@ -321,7 +323,8 @@ def get_search_id(self, query, time_range, limit=100, repos=[]):
                 "query": query,
                 "time_range": time_range,
                 "limit": limit,
-                "repos": repos
+                "repos": repos,
+                "timeout": timeout
             })
         }
         return self._http_request(
@@ -701,12 +704,13 @@ def get_searchid_command(client, args):
     time_range = args.get('time_range', 'Last 5 minutes')
     limit = args.get('limit', '100')
     repos = argToList(args.get('repos'))
+    timeout = args.get('timeout', '60')
     if limit:
         try:
             limit = int(limit)
         except ValueError:
             raise DemistoException(f"The provided argument '{limit}' for limit is not a valid integer.")
-    result = client.get_search_id(query, time_range, limit, repos)
+    result = client.get_search_id(query, time_range, limit, repos, timeout)
     if not result.get('success'):
         raise DemistoException(result.get('message'))
     search_id = result.get('search_id')
@@ -729,10 +733,14 @@ def get_searchid_command(client, args):
 
 def search_logs_command(client, args):
     search_id = args.get('search_id')
-    search_result = client.get_search_results(search_id)
-    if not search_result.get('success'):
-        raise DemistoException(search_result.get('message'))
-    rows = search_result.get('rows', [])
+    rows = []
+    while True:
+        search_result = client.get_search_results(search_id)
+        if not search_result.get('success'):
+            raise DemistoException(search_result.get('message'))
+        rows += search_result.get('rows', [])
+        if search_result.get('final'):
+            break
     if rows and len(rows) > 0:
         display_title = f"Found {len(rows)} logs"
         markdown = tableToMarkdown(display_title, rows, headers=None,
diff --git a/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.yml b/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.yml
index 75592883b978..78f124419a9c 100644
--- a/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.yml
+++ b/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/LogPoint_SIEM_Integration.yml
@@ -46,15 +46,20 @@ configuration:
   name: max_fetch
   type: 0
   required: false
+- defaultvalue: '1'
+  display: Incidents Fetch Interval
+  name: incidentFetchInterval
+  required: false
+  type: 19
 description: Use this Content Pack to search logs, fetch incident logs from LogPoint, analyze them for underlying threats, and respond to these threats in real-time.
 display: LogPoint SIEM Integration
 name: LogPoint SIEM Integration
 script:
   commands:
   - arguments:
-    - description: From Timestamp
+    - description: From Timestamp.
       name: ts_from
-    - description: To Timestamp
+    - description: To Timestamp.
       name: ts_to
     - description: Number of incidents to fetch. Accepts integer value.
       name: limit
@@ -62,82 +67,82 @@ script:
     name: lp-get-incidents
     outputs:
     - contextPath: LogPoint.Incidents.name
-      description: LogPoint Incident Name
+      description: LogPoint Incident Name.
       type: String
     - contextPath: LogPoint.Incidents.type
-      description: LogPoint Incident Type
+      description: LogPoint Incident Type.
       type: String
     - contextPath: LogPoint.Incidents.incident_id
-      description: LogPoint Incident ID
+      description: LogPoint Incident ID.
       type: String
     - contextPath: LogPoint.Incidents.assigned_to
-      description: LogPoint Incidents Assigned To
+      description: LogPoint Incidents Assigned To.
       type: String
     - contextPath: LogPoint.Incidents.status
-      description: LogPoint Incidents Status
+      description: LogPoint Incidents Status.
       type: String
     - contextPath: LogPoint.Incidents.id
-      description: LogPoint Incident Object ID
+      description: LogPoint Incident Object ID.
       type: String
     - contextPath: LogPoint.Incidents.detection_timestamp
-      description: LogPoint Incidents Detection Timestamp
+      description: LogPoint Incidents Detection Timestamp.
       type: Number
     - contextPath: LogPoint.Incidents.username
-      description: LogPoint Incident Username
+      description: LogPoint Incident Username.
       type: String
     - contextPath: LogPoint.Incidents.user_id
-      description: LogPoint Incidents User ID
+      description: LogPoint Incidents User ID.
       type: String
     - contextPath: LogPoint.Incidents.assigned_to
-      description: LogPoint Incidents Assigned To
+      description: LogPoint Incidents Assigned To.
       type: String
     - contextPath: LogPoint.Incidents.visible_to
-      description: LogPoint Incidents Visible To
+      description: LogPoint Incidents Visible To.
       type: String
     - contextPath: LogPoint.Incidents.tid
-      description: LogPoint Incidents Tid
+      description: LogPoint Incidents Tid.
       type: String
     - contextPath: LogPoint.Incidents.rows_count
-      description: LogPoint Incidents Rows Count
+      description: LogPoint Incidents Rows Count.
       type: String
     - contextPath: LogPoint.Incidents.risk_level
-      description: LogPoint Incidents Risk Level
+      description: LogPoint Incidents Risk Level.
       type: String
     - contextPath: LogPoint.Incidents.detection_timestamp
-      description: LogPoint Incidents Detection Timestamp
+      description: LogPoint Incidents Detection Timestamp.
       type: String
     - contextPath: LogPoint.Incidents.loginspect_ip_dns
-      description: LogPoint Incidents Loginspect IP DNS
+      description: LogPoint Incidents Loginspect IP DNS.
       type: String
     - contextPath: LogPoint.Incidents.status
-      description: LogPoint Incidents Status
+      description: LogPoint Incidents Status.
       type: String
     - contextPath: LogPoint.Incidents.comments
-      description: LogPoint Incidents Comments
+      description: LogPoint Incidents Comments.
       type: String
     - contextPath: LogPoint.Incidents.commentscount
-      description: LogPoint Incidents Comments Count
+      description: LogPoint Incidents Comments Count.
       type: Number
     - contextPath: LogPoint.Incidents.query
-      description: LogPoint Incidents Query
+      description: LogPoint Incidents Query.
       type: String
     - contextPath: LogPoint.Incidents.repos
-      description: LogPoint Incidents Repos
+      description: LogPoint Incidents Repos.
       type: String
     - contextPath: LogPoint.Incidents.time_range
-      description: LogPoint Incidents Time Range
+      description: LogPoint Incidents Time Range.
       type: String
     - contextPath: LogPoint.Incidents.alert_obj_id
-      description: LogPoint Incidents Alert Obj Id
+      description: LogPoint Incidents Alert Obj Id.
       type: String
     - contextPath: LogPoint.Incidents.throttle_enabled
-      description: LogPoint Incidents Throttle Enabled
+      description: LogPoint Incidents Throttle Enabled.
       type: Boolean
     - contextPath: LogPoint.Incidents.lastaction
-      description: LogPoint Incidents Last Action
+      description: LogPoint Incidents Last Action.
       type: String
     - contextPath: LogPoint.Incidents.description
-      description: LogPoint Incidents Description
+      description: LogPoint Incidents Description.
       type: String
   - arguments:
     - description: Object ID of a particular incident. It is the value contained in 'id' key of the incidents obtained from 'lp-get-incidents' command.
@@ -149,403 +154,403 @@ script:
     - description: Incident Detection TImestamp. It is the value contained in 'detection_timestamp' key of the incidents obtained from 'lp-get-incidents' command.
       name: date
       required: true
-    description: Retrieves a Particular Incident's Data
+    description: Retrieves a Particular Incident's Data.
     name: lp-get-incident-data
     outputs:
     - contextPath: LogPoint.Incidents.data.use
-      description: LogPoint Incidents Data Use
+      description: LogPoint Incidents Data Use.
       type: String
     - contextPath: LogPoint.Incidents.data.used
-      description: LogPoint Incidents Data Used
+      description: LogPoint Incidents Data Used.
       type: String
     - contextPath: LogPoint.Incidents.data.log_ts
-      description: LogPoint Incidents Data Log Ts
+      description: LogPoint Incidents Data Log Ts.
       type: Number
     - contextPath: LogPoint.Incidents.data._type_str
-      description: LogPoint Incidents Data Type Str
+      description: LogPoint Incidents Data Type Str.
       type: String
     - contextPath: LogPoint.Incidents.data.msg
-      description: LogPoint Incidents Data Msg
+      description: LogPoint Incidents Data Msg.
       type: String
     - contextPath: LogPoint.Incidents.data.total
-      description: LogPoint Incidents Data Total
+      description: LogPoint Incidents Data Total.
       type: String
     - contextPath: LogPoint.Incidents.data.device_name
-      description: LogPoint Incidents Data Device Name
+      description: LogPoint Incidents Data Device Name.
       type: String
     - contextPath: LogPoint.Incidents.data._offset
-      description: LogPoint Incidents Data Offset
+      description: LogPoint Incidents Data Offset.
       type: String
     - contextPath: LogPoint.Incidents.data.logpoint_name
-      description: LogPoint Incidents Data LogPoint Name
+      description: LogPoint Incidents Data LogPoint Name.
       type: String
     - contextPath: LogPoint.Incidents.data.repo_name
-      description: LogPoint Incidents Data Repo Name
+      description: LogPoint Incidents Data Repo Name.
       type: String
     - contextPath: LogPoint.Incidents.data.free
-      description: LogPoint Incidents Data Free
+      description: LogPoint Incidents Data Free.
       type: String
     - contextPath: LogPoint.Incidents.data.source_name
-      description: LogPoint Incidents Data Source Name
+      description: LogPoint Incidents Data Source Name.
       type: String
     - contextPath: LogPoint.Incidents.data.col_ts
-      description: LogPoint Incidents Data Col Ts
+      description: LogPoint Incidents Data Col Ts.
       type: Number
     - contextPath: LogPoint.Incidents.data._tz
-      description: LogPoint Incidents Data Tz
+      description: LogPoint Incidents Data Tz.
       type: String
     - contextPath: LogPoint.Incidents.data.norm_id
-      description: LogPoint Incidents Data Norm Id
+      description: LogPoint Incidents Data Norm Id.
       type: String
     - contextPath: LogPoint.Incidents.data._identifier
-      description: LogPoint Incidents Data Identifier
+      description: LogPoint Incidents Data Identifier.
       type: String
     - contextPath: LogPoint.Incidents.data.collected_at
-      description: LogPoint Incidents Data Collected At
+      description: LogPoint Incidents Data Collected At.
       type: String
     - contextPath: LogPoint.Incidents.data.device_ip
-      description: LogPoint Incidents Data Device IP
+      description: LogPoint Incidents Data Device IP.
       type: String
     - contextPath: LogPoint.Incidents.data._fromV550
-      description: LogPoint Incidents Data From V550
+      description: LogPoint Incidents Data From V550.
       type: String
     - contextPath: LogPoint.Incidents.data._enrich_policy
-      description: LogPoint Incidents Data Enrich Policy
+      description: LogPoint Incidents Data Enrich Policy.
       type: String
     - contextPath: LogPoint.Incidents.data._type_num
-      description: LogPoint Incidents Data Type Num
+      description: LogPoint Incidents Data Type Num.
       type: String
     - contextPath: LogPoint.Incidents.data._type_ip
-      description: LogPoint Incidents Data Type IP
+      description: LogPoint Incidents Data Type IP.
       type: String
     - contextPath: LogPoint.Incidents.data.sig_id
-      description: LogPoint Incidents Data Sig Id
+      description: LogPoint Incidents Data Sig Id.
       type: String
     - contextPath: LogPoint.Incidents.data.col_type
-      description: LogPoint Incidents Data Col Type
+      description: LogPoint Incidents Data Col Type.
       type: String
     - contextPath: LogPoint.Incidents.data.object
-      description: LogPoint Incidents Data Object
+      description: LogPoint Incidents Data Object.
       type: String
     - contextPath: LogPoint.Incidents.data._labels
-      description: LogPoint Incidents Data Labels
+      description: LogPoint Incidents Data Labels.
       type: String
     - contextPath: LogPoint.Incidents.data.source_address
-      description: Source Address
+      description: Source Address.
       type: String
     - contextPath: LogPoint.Incidents.data.destination_address
-      description: Destination Address
+      description: Destination Address.
       type: String
     - contextPath: LogPoint.Incidents.data.workstation
-      description: Workstation
+      description: Workstation.
       type: String
     - contextPath: LogPoint.Incidents.data.domain
-      description: Domain
+      description: Domain.
       type: String
     - contextPath: LogPoint.Incidents.data.user
-      description: User
+      description: User.
       type: String
     - contextPath: LogPoint.Incidents.data.caller_user
-      description: Caller User
+      description: Caller User.
       type: String
     - contextPath: LogPoint.Incidents.data.target_user
-      description: Target User
+      description: Target User.
       type: String
     - contextPath: LogPoint.Incidents.data.source_machine_id
-      description: Source Machie Id
+      description: Source Machie Id.
       type: String
     - contextPath: LogPoint.Incidents.data.destination_machine_id
-      description: Destination Machine Id
+      description: Destination Machine Id.
       type: String
     - contextPath: LogPoint.Incidents.data.destination_port
-      description: Destination Port
+      description: Destination Port.
       type: String
     - contextPath: LogPoint.Incidents.data.event_type
-      description: Event Type
+      description: Event Type.
       type: String
     - contextPath: LogPoint.Incidents.data.share_path
-      description: Share Path
+      description: Share Path.
       type: String
     - contextPath: LogPoint.Incidents.data.object_name
-      description: Object Name
+      description: Object Name.
       type: String
     - contextPath: LogPoint.Incidents.data.sub_status_code
-      description: Sub Status Code
+      description: Sub Status Code.
       type: String
     - contextPath: LogPoint.Incidents.data.object_type
-      description: Object Type
+      description: Object Type.
       type: String
     - contextPath: LogPoint.Incidents.data.request_method
-      description: Request Method
+      description: Request Method.
       type: String
     - contextPath: LogPoint.Incidents.data.status_code
-      description: Status Code
+      description: Status Code.
       type: String
     - contextPath: LogPoint.Incidents.data.received_datasize
-      description: Received Datasize
+      description: Received Datasize.
       type: String
     - contextPath: LogPoint.Incidents.data.received_packet
-      description: Received Packet
+      description: Received Packet.
       type: String
     - contextPath: LogPoint.Incidents.data.user_agent
-      description: User Agent
+      description: User Agent.
       type: String
     - contextPath: LogPoint.Incidents.data.sent_datasize
-      description: Sent Datasize
+      description: Sent Datasize.
       type: String
     - contextPath: LogPoint.Incidents.data.sender
-      description: Sender
+      description: Sender.
       type: String
     - contextPath: LogPoint.Incidents.data.receiver
-      description: Receiver
+      description: Receiver.
       type: String
     - contextPath: LogPoint.Incidents.data.datasize
-      description: Datasize
+      description: Datasize.
       type: String
     - contextPath: LogPoint.Incidents.data.file
-      description: File
+      description: File.
       type: String
     - contextPath: LogPoint.Incidents.data.subject
-      description: Subject
+      description: Subject.
       type: String
     - contextPath: LogPoint.Incidents.data.status
-      description: Status
+      description: Status.
       type: String
     - contextPath: LogPoint.Incidents.data.file_count
-      description: File Count
+      description: File Count.
       type: String
     - contextPath: LogPoint.Incidents.data.protocol_id
-      description: Protocol Id
+      description: Protocol Id.
       type: String
     - contextPath: LogPoint.Incidents.data.sent_packet
-      description: Sent Packet
+      description: Sent Packet.
       type: String
     - contextPath: LogPoint.Incidents.data.service
-      description: Service
+      description: Service.
       type: String
     - contextPath: LogPoint.Incidents.data.printer
-      description: Printer
+      description: Printer.
       type: String
     - contextPath: LogPoint.Incidents.data.print_count
-      description: Print Count
+      description: Print Count.
       type: String
     - contextPath: LogPoint.Incidents.data.event_id
-      description: Event Id
+      description: Event Id.
       type: String
     - contextPath: LogPoint.Incidents.data.country_name
-      description: Country Name
+      description: Country Name.
       type: String
     - contextPath: LogPoint.Incidents.data.host
-      description: Host
+      description: Host.
       type: String
     - contextPath: LogPoint.Incidents.data.hash
-      description: Hash
+      description: Hash.
       type: String
     - contextPath: LogPoint.Incidents.data.hash_sha1
-      description: Hash SHA1
+      description: Hash SHA1.
       type: String
     - contextPath: LogPoint.Incidents.data.agent_address
-      description: Agent Address
+      description: Agent Address.
       type: String
     - contextPath: LogPoint.Incidents.data.attacker_address
-      description: Attacker Address
+      description: Attacker Address.
       type: String
     - contextPath: LogPoint.Incidents.data.broadcast_address
-      description: Broadcast Address
+      description: Broadcast Address.
       type: String
     - contextPath: LogPoint.Incidents.data.client_address
-      description: Client Address
+      description: Client Address.
       type: String
     - contextPath: LogPoint.Incidents.data.client_hardware_address
-      description: Client Hardware Address
+      description: Client Hardware Address.
       type: String
     - contextPath: LogPoint.Incidents.data.destination_hardware_address
-      description: Destination Hardware Address
+      description: Destination Hardware Address.
       type: String
     - contextPath: LogPoint.Incidents.data.destination_nat_address
-      description: Destination NAT Address
+      description: Destination NAT Address.
       type: String
     - contextPath: LogPoint.Incidents.data.device_address
-      description: Device Address
+      description: Device Address.
       type: String
     - contextPath: LogPoint.Incidents.data.external_address
-      description: External Address
+      description: External Address.
       type: String
     - contextPath: LogPoint.Incidents.data.gateway_address
-      description: Gateway Address
+      description: Gateway Address.
       type: String
     - contextPath: LogPoint.Incidents.data.hardware_address
-      description: Hardware Address
+      description: Hardware Address.
       type: String
     - contextPath: LogPoint.Incidents.data.host_address
-      description: Host Address
+      description: Host Address.
       type: String
     - contextPath: LogPoint.Incidents.data.interface_address
-      description: Interface Address
+      description: Interface Address.
       type: String
     - contextPath: LogPoint.Incidents.data.lease_address
-      description: Lease Address
+      description: Lease Address.
       type: String
     - contextPath: LogPoint.Incidents.data.local_address
-      description: Local Address
+      description: Local Address.
       type: String
     - contextPath: LogPoint.Incidents.data.nas_address
-      description: Nas ddress
+      description: Nas ddress.
       type: String
     - contextPath: LogPoint.Incidents.data.nas_ipv6_address
-      description: Nas_IPV6 Address
+      description: Nas_IPV6 Address.
       type: String
     - contextPath: LogPoint.Incidents.data.nat_address
-      description: NAT Address
+      description: NAT Address.
       type: String
     - contextPath: LogPoint.Incidents.data.nat_source_address
-      description: NAT Source Address
+      description: NAT Source Address.
       type: String
     - contextPath: LogPoint.Incidents.data.network_address
-      description: Network Address
+      description: Network Address.
       type: String
     - contextPath: LogPoint.Incidents.data.new_hardware_address
-      description: New Hardware Address
+      description: New Hardware Address.
       type: String
     - contextPath: LogPoint.Incidents.data.old_hardware_address
-      description: Old Hardware Address
+      description: Old Hardware Address.
       type: String
     - contextPath: LogPoint.Incidents.data.original_address
-      description: Original Address
+      description: Original Address.
       type: String
     - contextPath: LogPoint.Incidents.data.original_client_address
-      description: Original Client Address
+      description: Original Client Address.
       type: String
     - contextPath: LogPoint.Incidents.data.original_destination_address
-      description: Original Destination Address
+      description: Original Destination Address.
       type: String
     - contextPath: LogPoint.Incidents.data.original_server_address
-      description: Original Server Address
+      description: Original Server Address.
       type: String
     - contextPath: LogPoint.Incidents.data.original_source_address
-      description: Original Source Address
+      description: Original Source Address.
       type: String
     - contextPath: LogPoint.Incidents.data.originating_address
-      description: Originating Address
+      description: Originating Address.
       type: String
     - contextPath: LogPoint.Incidents.data.peer_address
-      description: Peer Address
+      description: Peer Address.
       type: String
     - contextPath: LogPoint.Incidents.data.private_address
-      description: Private Address
+      description: Private Address.
       type: String
     - contextPath: LogPoint.Incidents.data.proxy_address
-      description: Proxy Address
+      description: Proxy Address.
       type: String
     - contextPath: LogPoint.Incidents.data.proxy_source_address
-      description: Proxy Source Address
+      description: Proxy Source Address.
       type: String
     - contextPath: LogPoint.Incidents.data.relay_address
-      description: Relay Address
+      description: Relay Address.
       type: String
     - contextPath: LogPoint.Incidents.data.remote_address
-      description: Remote Address
+      description: Remote Address.
       type: String
     - contextPath: LogPoint.Incidents.data.resolved_address
-      description: Resolved Address
+      description: Resolved Address.
       type: String
     - contextPath: LogPoint.Incidents.data.route_address
-      description: Route Address
+      description: Route Address.
       type: String
     - contextPath: LogPoint.Incidents.data.scanner_address
-      description: Scanner Address
+      description: Scanner Address.
       type: String
     - contextPath: LogPoint.Incidents.data.server_address
-      description: Server Address
+      description: Server Address.
       type: String
     - contextPath: LogPoint.Incidents.data.server_hardware_address
-      description: Server Hardware Address
+      description: Server Hardware Address.
       type: String
     - contextPath: LogPoint.Incidents.data.source_hardware_address
-      description: Source Hardware Address
+      description: Source Hardware Address.
       type: String
     - contextPath: LogPoint.Incidents.data.start_address
-      description: Start Address
+      description: Start Address.
       type: String
     - contextPath: LogPoint.Incidents.data.supplier_address
-      description: Supplier Address
+      description: Supplier Address.
       type: String
     - contextPath: LogPoint.Incidents.data.switch_address
-      description: Switch Address
+      description: Switch Address.
       type: String
     - contextPath: LogPoint.Incidents.data.translated_address
-      description: Translated Address
+      description: Translated Address.
       type: String
     - contextPath: LogPoint.Incidents.data.virtual_address
-      description: Virtual Address
+      description: Virtual Address.
       type: String
     - contextPath: LogPoint.Incidents.data.virtual_server_address
-      description: Virtual Server Address
+      description: Virtual Server Address.
       type: String
     - contextPath: LogPoint.Incidents.data.vpn_address
-      description: VPN Address
+      description: VPN Address.
       type: String
     - contextPath: LogPoint.Incidents.data.hash_length
-      description: Hash Length
+      description: Hash Length.
       type: String
     - contextPath: LogPoint.Incidents.data.hash_sha256
-      description: Hash SHA256
+      description: Hash SHA256.
       type: String
     - contextPath: LogPoint.Incidents.data.alternate_user
-      description: Alternate User
+      description: Alternate User.
       type: String
     - contextPath: LogPoint.Incidents.data.authenticated_user
-      description: Authenticated User
+      description: Authenticated User.
       type: String
     - contextPath: LogPoint.Incidents.data.authorized_user
-      description: Authorized User
+      description: Authorized User.
       type: String
     - contextPath: LogPoint.Incidents.data.certificate_user
-      description: Certificate User
+      description: Certificate User.
       type: String
     - contextPath: LogPoint.Incidents.data.current_user
-      description: Current User
+      description: Current User.
       type: String
     - contextPath: LogPoint.Incidents.data.database_user
-      description: Database User
+      description: Database User.
       type: String
     - contextPath: LogPoint.Incidents.data.destination_user
-      description: Destination User
+      description: Destination User.
       type: String
     - contextPath: LogPoint.Incidents.data.logon_user
-      description: Logon User
+      description: Logon User.
       type: String
     - contextPath: LogPoint.Incidents.data.new_max_user
-      description: New Max User
+      description: New Max User.
       type: String
     - contextPath: LogPoint.Incidents.data.new_user
-      description: New User
+      description: New User.
       type: String
     - contextPath: LogPoint.Incidents.data.old_max_user
-      description: Old Max User
+      description: Old Max User.
       type: String
     - contextPath: LogPoint.Incidents.data.os_user
-      description: OS User
+      description: OS User.
       type: String
     - contextPath: LogPoint.Incidents.data.remote_user
-      description: Remote User
+      description: Remote User.
       type: String
     - contextPath: LogPoint.Incidents.data.source_user
-      description: Source User
+      description: Source User.
       type: String
     - contextPath: LogPoint.Incidents.data.system_user
-      description: System User
+      description: System User.
       type: String
     - contextPath: LogPoint.Incidents.data.target_logon_user
-      description: Target Logon User
+      description: Target Logon User.
       type: String
     - contextPath: LogPoint.Incidents.data.zone_user
-      description: Zone User
+      description: Zone User.
       type: String
   - arguments:
-    - description: From Timestamp
+    - description: From Timestamp.
       name: ts_from
-    - description: To Timestamp
+    - description: To Timestamp.
       name: ts_to
     - description: Number of incident states data to fetch. Accepts integer value.
       name: limit
@@ -553,16 +558,16 @@ script:
     name: lp-get-incident-states
     outputs:
     - contextPath: LogPoint.Incidents.states.id
-      description: LogPoint Incidents States Id
+      description: LogPoint Incidents States Id.
       type: String
     - contextPath: LogPoint.Incidents.states.status
-      description: LogPoint Incidents States Status
+      description: LogPoint Incidents States Status.
       type: String
     - contextPath: LogPoint.Incidents.states.assigned_to
-      description: LogPoint Incidents States Assigned To
+      description: LogPoint Incidents States Assigned To.
       type: String
     - contextPath: LogPoint.Incidents.states.comments
-      description: LogPoint Incidents States Comments
+      description: LogPoint Incidents States Comments.
       type: String
   - arguments:
     - description: Object ID of a particular incident. It is the value contained in 'id' key of the incidents obtained from 'lp-get-incidents' command.
@@ -571,11 +576,11 @@ script:
     - description: Comment to be added to the incidents.
       name: comment
       required: true
-    description: Add comments to the incidents
+    description: Add comments to the incidents.
     name: lp-add-incident-comment
     outputs:
     - contextPath: LogPoint.Incidents.comment
-      description: LogPoint Incidents Comment
+      description: LogPoint Incidents Comment.
       type: String
   - arguments:
     - description: Object ID of a particular incident. It is the value contained in 'id' key of the incidents obtained from 'lp-get-incidents' command. Multiple id can be provided by separating them using comma.
@@ -585,11 +590,11 @@ script:
     - description: Id of the user whom the incidents are assigned.  It can be displayed using 'lp-get-users' command.
       name: new_assignee
       required: true
-    description: Assigning/Re-assigning Incidents
+    description: Assigning/Re-assigning Incidents.
     name: lp-assign-incidents
     outputs:
     - contextPath: LogPoint.Incidents.assign
-      description: LogPoint Incidents Assign
+      description: LogPoint Incidents Assign.
       type: String
   - arguments:
     - description: Object ID of a particular incident. It is the value contained in 'id' key of the incidents obtained from 'lp-get-incidents' command. Multiple id can be provided by separating them using comma.
@@ -600,7 +605,7 @@ script:
     name: lp-resolve-incidents
     outputs:
     - contextPath: LogPoint.Incidents.resolve
-      description: LogPoint Incidents Resolve
+      description: LogPoint Incidents Resolve.
       type: String
   - arguments:
     - description: Object ID of a particular incident. It is the value contained in 'id' key of the incidents obtained from 'lp-get-incidents' command. Multiple id can be provided by separating them using comma.
@@ -611,31 +616,32 @@ script:
     name: lp-close-incidents
     outputs:
     - contextPath: LogPoint.Incidents.close
-      description: LogPoint Incidents Close
+      description: LogPoint Incidents Close.
       type: String
   - arguments:
     - description: Object ID of a particular incident. It is the value contained in 'id' key of the incidents obtained from 'lp-get-incidents' command. Multiple id can be provided by separating them using comma.
       isArray: true
       name: incident_obj_ids
       required: true
-    description: Re-opens the closed incidents
+    description: Re-opens the closed incidents.
     name: lp-reopen-incidents
     outputs:
     - contextPath: LogPoint.Incidents.reopen
-      description: LogPoint Incidents Reopen
+      description: LogPoint Incidents Reopen.
       type: String
   - description: Gets Incident users and user groups.
     name: lp-get-users
     outputs:
     - contextPath: LogPoint.Incidents.users.id
-      description: LogPoint Incidents Users Id
+      description: LogPoint Incidents Users Id.
       type: String
     - contextPath: LogPoint.Incidents.users.name
-      description: LogPoint Incidents Users Name
+      description: LogPoint Incidents Users Name.
       type: String
     - contextPath: LogPoint.Incidents.users.usergroups
-      description: LogPoint Incidents Users Usergroups
+      description: LogPoint Incidents Users Usergroups.
       type: String
+    arguments: []
   - description: Gets LogPoint user's preference such as timezone, date format, etc.
     name: lp-get-users-preference
     outputs:
@@ -648,6 +654,7 @@ script:
     - contextPath: LogPoint.User.Preference.hour_format
       description: LogPoint user's hour format.
       type: String
+    arguments: []
   - description: Gets user's LogPoints.
     name: lp-get-logpoints
     outputs:
@@ -657,6 +664,7 @@ script:
     - contextPath: LogPoint.LogPoints.ip
       description: LogPoint's IP address.
       type: String
+    arguments: []
   - description: Gets the list of LogPoint repos that can be accessed by the user.
     name: lp-get-repos
     outputs:
@@ -666,6 +674,7 @@ script:
     - contextPath: LogPoint.Repos.address
       description: LogPoint repo address.
       type: String
+    arguments: []
   - description: Gets devices associated with LogPoint.
     name: lp-get-devices
     outputs:
@@ -675,6 +684,7 @@ script:
     - contextPath: LogPoint.Devices.address
       description: Device IP address.
       type: String
+    arguments: []
   - description: Gets live search results of the alerts and dashboards.
     name: lp-get-livesearches
     outputs:
@@ -690,6 +700,7 @@ script:
     - contextPath: LogPoint.LiveSearches.query
       description: The live search query.
       type: String
+    arguments: []
   - arguments:
     - description: LogPoint search query. This should be the exact query to use to search logs in the LogPoint UI.
       name: query
@@ -703,6 +714,9 @@ script:
     - description: A comma-separated list of LogPoint repos from which logs are to be fetched. If not provided, it will display logs from all repos.
       isArray: true
       name: repos
+    - defaultValue: '60'
+      description: LogPoint search timeout in seconds.
+      name: timeout
     description: Gets the search ID based on the provided search parameters.
     name: lp-get-searchid
     outputs:
@@ -719,10 +733,10 @@ script:
     - contextPath: LogPoint.SearchLogs
       description: Search results.
       type: String
-  dockerimage: demisto/python3:3.10.14.90585
+  dockerimage: demisto/python3:3.10.14.99865
   isfetch: true
   runonce: false
-  script: '-'
+  script: ''
   subtype: python3
   type: python
 tests:
@@ -730,5 +744,4 @@ tests:
 - LogPoint SIEM Integration - Test Playbook 2
 - LogPoint SIEM Integration - Test Playbook 3
 defaultmapperin: LogPoint SIEM Integration - Incoming Mapper
-defaultclassifier:
 fromversion: 6.0.0
diff --git a/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/README.md b/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/README.md
index d86a8c1325ee..622b51cdbb9b 100644
--- a/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/README.md
+++ b/Packs/LogPoint_SIEM_Integration/Integrations/LogPoint_SIEM_Integration/README.md
@@ -17,17 +17,19 @@ This integration was integrated and tested with version 6.7.4 of LogPoint.
 
     | **Parameter** | **Description** | **Required** |
     | --- | --- | --- |
-    | url | LogPoint URL | True |
-    | username | LogPoint Username | True |
-    | apikey | API Key | True |
-    | insecure | Trust any certificate \(not secure\) | False |
-    | proxy | Use system proxy settings | False |
-    | first_fetch | First fetch timestamp  (\<number\> \<time unit\>, e.g., 6 hours, 1 day) | False |
-    | incidentType | Incident type | False |
-    | isFetch | Fetch incidents | False |
-    | max_fetch | Fetch limit \(Max value is 200, Recommended value is 50 or less\) | False |
+    | LogPoint URL |  | True |
+    | LogPoint Username |  | True |
+    | API Key | User's secret key | True |
+    | Trust any certificate (not secure) | Whether to allow connections without verifying SSL certificates validity. | False |
+    | Use system proxy settings | Whether to use XSOAR’s system proxy settings to connect to the API | False |
+    | First fetch timestamp (&lt;number&gt; &lt;time unit&gt;, e.g., 6 hours, 1 day) | If it is not provided, incidents from past 24 hours will be fetched by default. | False |
+    | Incident type |  | False |
+    | Fetch incidents |  | False |
+    | Fetch limit (Max value is 200, Recommended value is 50 or less) | If this is left blank, maximum 50 incidents will be fetched at a time. | False |
+    | Incidents Fetch Interval |  | False |
 
 4. Click **Test** to validate the URLs, token, and connection.
+
 ## Commands
 You can execute these commands from the Cortex XSOAR CLI, as part of an automation, or in a playbook.
 After you successfully execute a command, a DBot message appears in the War Room with the command details.
@@ -1047,9 +1049,10 @@ Gets the search ID based on the provided search parameters.
 | **Argument Name** | **Description** | **Required** |
 | --- | --- | --- |
 | query | LogPoint search query. | Required | 
-| time_range | Time range. For example: Last 30 minutes, Last 7 days, etc. If not provided, it will use 'Last 5 minutes' as the time range by default. Default is Last 5 minutes. | Optional | 
-| limit | Number of logs to fetch. If not provided, first 100 logs will be displayed. Default is 100. | Optional | 
-| repos | Comma-separated list of LogPoint repos from which logs are to be fetched. If not provided, it will display logs from all repos. | Optional | 
+| time_range | Time range. For example: Last 30 minutes, Last 7 days, etc. If not provided, it will use 'Last 5 minutes' as the time range by default. Default is "Last 5 minutes". | Optional | 
+| limit | Number of logs to fetch. If not provided, the first 100 logs will be displayed. Default is 100. | Optional | 
+| repos | A comma-separated list of LogPoint repos from which logs are to be fetched. If not provided, it will display logs from all repos. | Optional |
+| timeout | LogPoint search timeout in seconds. Default is 60. | Optional | 
 
 
 #### Context Output
diff --git a/Packs/LogPoint_SIEM_Integration/ReleaseNotes/1_2_11.md b/Packs/LogPoint_SIEM_Integration/ReleaseNotes/1_2_11.md
new file mode 100644
index 000000000000..73dba8a3c57b
--- /dev/null
+++ b/Packs/LogPoint_SIEM_Integration/ReleaseNotes/1_2_11.md
@@ -0,0 +1,8 @@
+
+#### Integrations
+
+##### LogPoint SIEM Integration
+
+- Added the timeout parameter to the **lp-get-searchid** command, which enables you to define the amount of time that the integration will try to execute commands before it throws an error.
+- Updated the **lp-search-logs** command to retrieve all the search logs, instead of only a portion.
+- Updated the Docker image to: *demisto/python3:3.10.14.99865*.
\ No newline at end of file
diff --git a/Packs/LogPoint_SIEM_Integration/pack_metadata.json b/Packs/LogPoint_SIEM_Integration/pack_metadata.json
index d4c38eea4d36..41964810f236 100644
--- a/Packs/LogPoint_SIEM_Integration/pack_metadata.json
+++ b/Packs/LogPoint_SIEM_Integration/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "LogPoint SIEM Integration",
     "description": "Use this Content Pack to fetch incident logs from LogPoint, analyze them for underlying threats, and respond to these threats in real-time.",
     "support": "partner",
-    "currentVersion": "1.2.10",
+    "currentVersion": "1.2.11",
     "author": "LogPoint",
     "authorImage": "content/Packs/LogPoint_SIEM_Integration/doc_files/LogPoint_image.png",
     "url": "https://servicedesk.logpoint.com",
diff --git a/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.py b/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.py
index 4cad70217c35..5f46969e83e0 100644
--- a/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.py
+++ b/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.py
@@ -130,6 +130,7 @@ def cert_verify(self, conn, url, verify, cert):
 MARK_AS_READ = demisto.params().get('markAsRead', False)
 MAX_FETCH = min(50, int(demisto.params().get('maxFetch', 50)))
 FETCH_TIME = demisto.params().get('fetch_time') or '10 minutes'
+LEGACY_NAME = argToBoolean(demisto.params().get('legacy_name', False))
 
 LAST_RUN_IDS_QUEUE_SIZE = 500
 
@@ -401,13 +402,14 @@ def get_time_zone() -> EWSTimeZone | None:
     return time_zone
 
 
-def get_attachment_name(attachment_name, content_id="", attachment_id=""):  # pragma: no cover
-    identifier_id = content_id
-    if not identifier_id or identifier_id == "None":
-        identifier_id = attachment_id
+def get_attachment_name(attachment_name, content_id="", is_inline=False):  # pragma: no cover
+    if is_inline and content_id and content_id != "None" and not LEGACY_NAME:
+        if attachment_name is None or attachment_name == "":
+            return f'{content_id}-attachmentName-demisto_untitled_attachment'
+        return f'{content_id}-attachmentName-{attachment_name}'
     if attachment_name is None or attachment_name == "":
-        return f'{identifier_id}-attachmentName-demisto_untitled_attachment'
-    return f'{identifier_id}-attachmentName-{attachment_name}'
+        return 'demisto_untitled_attachment'
+    return attachment_name
 
 
 def switch_hr_headers(obj, hr_header_changes):
@@ -1094,7 +1096,7 @@ def parse_incident_from_item(item, is_fetch):  # pragma: no cover
                                 # save the attachment
                                 file_name = get_attachment_name(attachment_name=attachment.name,
                                                                 content_id=attachment.content_id,
-                                                                attachment_id=attachment.attachment_id.id)
+                                                                is_inline=attachment.is_inline)
                                 file_result = fileResult(file_name, attachment.content)
 
                                 # check for error
@@ -1107,7 +1109,8 @@ def parse_incident_from_item(item, is_fetch):  # pragma: no cover
                                     'path': file_result['FileID'],
                                     'name': get_attachment_name(attachment_name=attachment.name,
                                                                 content_id=attachment.content_id,
-                                                                attachment_id=attachment.attachment_id.id),
+                                                                is_inline=attachment.is_inline),
+                                    "description": FileAttachmentType.ATTACHED if not attachment.is_inline else ""
                                 })
                         except TypeError as e:
                             if str(e) != "must be string or buffer, not None":
@@ -1145,7 +1148,7 @@ def parse_incident_from_item(item, is_fetch):  # pragma: no cover
 
                             file_result = fileResult(get_attachment_name(attachment_name=attachment.name,
                                                                          content_id=attachment.content_id,
-                                                                         attachment_id=attachment.attachment_id.id) + ".eml",
+                                                                         is_inline=attachment.is_inline) + ".eml",
                                                      attached_email.as_string())
 
                         if file_result:
@@ -1159,19 +1162,19 @@ def parse_incident_from_item(item, is_fetch):  # pragma: no cover
                                 'path': file_result['FileID'],
                                 'name': get_attachment_name(attachment_name=attachment.name,
                                                             content_id=attachment.content_id,
-                                                            attachment_id=attachment.attachment_id.id) + ".eml",
+                                                            is_inline=attachment.is_inline) + ".eml",
                             })
 
                         else:
                             incident['attachment'].append({
                                 'name': get_attachment_name(attachment_name=attachment.name,
                                                             content_id=attachment.content_id,
-                                                            attachment_id=attachment.attachment_id.id) + ".eml",
+                                                            is_inline=attachment.is_inline) + ".eml",
                             })
 
                     labels.append({'type': label_attachment_type, 'value': get_attachment_name(attachment_name=attachment.name,
                                                                                                content_id=attachment.content_id,
-                                                                                               attachment_id=attachment.attachment_id.id)})
+                                                                                               is_inline=attachment.is_inline)})
                     labels.append({'type': label_attachment_id_type, 'value': attachment.attachment_id.id})
 
         # handle headers
@@ -1299,7 +1302,7 @@ def fetch_emails_as_incidents(account_email, folder_name):
 def get_entry_for_file_attachment(item_id, attachment):  # pragma: no cover
     entry = fileResult(get_attachment_name(attachment_name=attachment.name,
                                            content_id=attachment.content_id,
-                                           attachment_id=attachment.attachment_id.id), attachment.content)
+                                           is_inline=attachment.is_inline), attachment.content)
     ec = {
         CONTEXT_UPDATE_EWS_ITEM_FOR_ATTACHMENT + CONTEXT_UPDATE_FILE_ATTACHMENT: parse_attachment_as_dict(item_id,
                                                                                                           attachment)
@@ -1320,7 +1323,7 @@ def parse_attachment_as_dict(item_id, attachment):  # pragma: no cover
                 ATTACHMENT_ID: attachment.attachment_id.id,
                 'attachmentName': get_attachment_name(attachment_name=attachment.name,
                                                       content_id=attachment.content_id,
-                                                      attachment_id=attachment.attachment_id.id),
+                                                      is_inline=attachment.is_inline),
                 'attachmentSHA256': hashlib.sha256(attachment_content).hexdigest() if attachment_content else None,
                 'attachmentContentType': attachment.content_type,
                 'attachmentContentId': attachment.content_id,
@@ -1339,7 +1342,7 @@ def parse_attachment_as_dict(item_id, attachment):  # pragma: no cover
                 ATTACHMENT_ID: attachment.attachment_id.id,
                 'attachmentName': get_attachment_name(attachment_name=attachment.name,
                                                       content_id=attachment.content_id,
-                                                      attachment_id=attachment.attachment_id.id),
+                                                      is_inline=attachment.is_inline),
                 'attachmentSize': attachment.size,
                 'attachmentLastModifiedTime': attachment.last_modified_time.ewsformat(),
                 'attachmentIsInline': attachment.is_inline,
@@ -1355,7 +1358,7 @@ def parse_attachment_as_dict(item_id, attachment):  # pragma: no cover
             ATTACHMENT_ID: attachment.attachment_id.id,
             'attachmentName': get_attachment_name(attachment_name=attachment.name,
                                                   content_id=attachment.content_id,
-                                                  attachment_id=attachment.attachment_id.id),
+                                                  is_inline=attachment.is_inline),
             'attachmentSHA256': None,
             'attachmentContentType': attachment.content_type,
             'attachmentContentId': attachment.content_id,
@@ -1372,7 +1375,7 @@ def get_entry_for_item_attachment(item_id, attachment, target_email):  # pragma:
     dict_result = parse_attachment_as_dict(item_id, attachment)
     dict_result.update(parse_item_as_dict(item, target_email, camel_case=True, compact_fields=True))
     title = (f'EWS get attachment got item for "{target_email}", '
-             f'"{get_attachment_name(attachment_name=attachment.name,content_id=attachment.content_id, attachment_id=attachment.attachment_id.id)}"')  # noqa: E501
+             f'"{get_attachment_name(attachment_name=attachment.name,content_id=attachment.content_id, is_inline=attachment.is_inline)}"')  # noqa: E501
 
     return get_entry_for_object(title, CONTEXT_UPDATE_EWS_ITEM_FOR_ATTACHMENT + CONTEXT_UPDATE_ITEM_ATTACHMENT,
                                 dict_result)
@@ -1438,23 +1441,20 @@ def fetch_attachments_for_message(item_id, target_mailbox=None, attachment_ids=N
     attachments = get_attachments_for_item(item_id, account, attachment_ids)
     entries = []
     for attachment in attachments:
-        if (not identifiers_filter
-            or attachment.content_id in identifiers_filter
-                or attachment.attachment_id.id in identifiers_filter):
-            if isinstance(attachment, FileAttachment):
-                try:
-                    if attachment.content:
-                        entries.append(get_entry_for_file_attachment(item_id, attachment))
-                except TypeError as e:
-                    if str(e) != "must be string or buffer, not None":
-                        raise
-            else:
-                entries.append(get_entry_for_item_attachment(item_id, attachment, account.primary_smtp_address))
-                if attachment.item.mime_content:
-                    entries.append(fileResult(get_attachment_name(attachment_name=attachment.name,
-                                                                  content_id=attachment.content_id,
-                                                                  attachment_id=attachment.attachment_id.id) + ".eml",
-                                              attachment.item.mime_content))
+        if isinstance(attachment, FileAttachment):
+            try:
+                if attachment.content:
+                    entries.append(get_entry_for_file_attachment(item_id, attachment))
+            except TypeError as e:
+                if str(e) != "must be string or buffer, not None":
+                    raise
+        else:
+            entries.append(get_entry_for_item_attachment(item_id, attachment, account.primary_smtp_address))
+            if attachment.item.mime_content:
+                entries.append(fileResult(get_attachment_name(attachment.name,
+                                                              content_id=attachment.content_id,
+                                                              is_inline=attachment.is_inline) + ".eml",
+                                          attachment.item.mime_content))
 
     return entries
 
diff --git a/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.yml b/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.yml
index be9f564e4017..aed17bd427da 100644
--- a/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.yml
+++ b/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2.yml
@@ -116,6 +116,12 @@ configuration:
   section: Connect
   advanced: true
   required: false
+- display: Use legacy attachment name
+  name: legacy_name
+  section: Collect
+  type: 8
+  advanced: true
+  defaultvalue: 'false'
 description: Exchange Web Services and Office 365 (mail).
 display: EWS v2
 name: EWS v2
@@ -130,10 +136,6 @@ script:
     - description: The attachments ids to get. If none - all attachments will be retrieve from the message. Support multiple attachments with comma-separated value or array.
       isArray: true
       name: attachment-ids
-    - description: Identifier ids to download to XSOAR (to avoid downloading all files to XSOAR during the preprocessing script).
-      hidden: true
-      name: identifiers-filter
-      required: false
     description: Retrieves the actual attachments from an item (email message). To get all attachments for a message, only specify the item-id argument.
     name: ews-get-attachment
     outputs:
diff --git a/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2_test.py b/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2_test.py
index d9d74262b511..1c2a30ca733c 100644
--- a/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2_test.py
+++ b/Packs/MicrosoftExchangeOnPremise/Integrations/EWSv2/EWSv2_test.py
@@ -874,12 +874,46 @@ def test_parse_item_as_dict_return_json_serializable():
     assert '"item_id": {"id": "id123", "changekey": "change"}' in item_as_json
 
 
-@pytest.mark.parametrize("attachment_name, content_id, attachment_id, expected_result", [
-    pytest.param('image1.png', "", '123', "123-attachmentName-image1.png"),
-    pytest.param('image1.png', '123', '456', "123-attachmentName-image1.png"),
-    pytest.param('image1.png', None, '456', "456-attachmentName-image1.png"),
+@pytest.mark.parametrize("attachment_name, content_id, is_inline, expected_result", [
+    pytest.param('image1.png', "", False, "image1.png"),
+    pytest.param('image1.png', '123', True, "123-attachmentName-image1.png"),
+    pytest.param('image1.png', None, False, "image1.png"),
 
 ])
-def test_get_attachment_name(attachment_name, content_id, attachment_id, expected_result):
+def test_get_attachment_name(attachment_name, content_id, is_inline, expected_result):
+    """
+    Given:
+        - case 1: attachment is not inline.
+        - case 1: attachment is inline.
+        - case 3: attachment is not inline.
+    When:
+        - get_attachment_name is called with LEGACY_NAME=FALSE
+    Then:
+        Only case 2 should add an ID to the attachment name.
+
+    """
+    assert get_attachment_name(attachment_name=attachment_name, content_id=content_id,
+                               is_inline=is_inline) == expected_result
+
+
+@pytest.mark.parametrize("attachment_name, content_id, is_inline, expected_result", [
+    pytest.param('image1.png', "", False, "image1.png"),
+    pytest.param('image1.png', '123', True, "image1.png"),
+    pytest.param('image1.png', None, False, "image1.png"),
+
+])
+def test_get_attachment_name_legacy_name(monkeypatch, attachment_name, content_id, is_inline, expected_result):
+    """
+    Given:
+        - case 1: attachment is not inline.
+        - case 1: attachment is inline.
+        - case 3: attachment is not inline.
+    When:
+        - get_attachment_name is called with LEGACY_NAME=FALSE
+    Then:
+        All cases should not add an ID to the attachment name.
+
+    """
+    monkeypatch.setattr('EWSv2.LEGACY_NAME', True)
     assert get_attachment_name(attachment_name=attachment_name, content_id=content_id,
-                               attachment_id=attachment_id) == expected_result
+                               is_inline=is_inline) == expected_result
diff --git a/Packs/MicrosoftExchangeOnPremise/ReleaseNotes/2_1_10.md b/Packs/MicrosoftExchangeOnPremise/ReleaseNotes/2_1_10.md
new file mode 100644
index 000000000000..f8b65d7704c3
--- /dev/null
+++ b/Packs/MicrosoftExchangeOnPremise/ReleaseNotes/2_1_10.md
@@ -0,0 +1,7 @@
+
+#### Integrations
+
+##### EWS v2
+
+- Added a Use Legacy Name configuration parameter in order to use the original attachment name.
+- Updated the attachment name to be in the following format: <the attachment ID\>-attachmentName-<the attachment name\> only if the attachment is inline and **Use Legacy Name** is disabled.
\ No newline at end of file
diff --git a/Packs/MicrosoftExchangeOnPremise/pack_metadata.json b/Packs/MicrosoftExchangeOnPremise/pack_metadata.json
index 2969194e8bda..ac43dabef32d 100644
--- a/Packs/MicrosoftExchangeOnPremise/pack_metadata.json
+++ b/Packs/MicrosoftExchangeOnPremise/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Microsoft Exchange On-Premise",
     "description": "Exchange Web Services",
     "support": "xsoar",
-    "currentVersion": "2.1.9",
+    "currentVersion": "2.1.10",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.py b/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.py
index a7590a209830..01ff92ea6071 100644
--- a/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.py
+++ b/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.py
@@ -121,6 +121,8 @@
     "textBody",
 ]
 
+# attachment name param
+LEGACY_NAME = argToBoolean(demisto.params().get('legacy_name', False))
 UTF_8 = 'utf-8'
 
 """ Classes """
@@ -219,6 +221,7 @@ def __init__(
         self.config = self.__prepare(insecure)
         self.protocol = BaseProtocol(self.config)
         self.mark_as_read = kwargs.get('mark_as_read', False)
+        self.legacy_name = argToBoolean(kwargs.get('legacy_name', False))
 
     def __prepare(self, insecure):  # pragma: no cover
         """
@@ -588,23 +591,26 @@ def start_logging():
 """ Helper Functions """
 
 
-def get_attachment_name(attachment_name, eml_extension=False, content_id="", attachment_id=""):
+def get_attachment_name(attachment_name, eml_extension=False, content_id="", is_inline=False):
     """
     Retrieve attachment name or error string if none is provided
     :param attachment_name: attachment name to retrieve
     :param eml_extension: Indicates whether the eml extension should be added
     :return: string
     """
-    identifier_id = content_id
-    if not identifier_id or identifier_id == "None":
-        identifier_id = attachment_id
+    if is_inline and content_id and content_id != "None" and not LEGACY_NAME:
+        if attachment_name is None or attachment_name == "":
+            return (f"{content_id}-attachmentName-demisto_untitled_attachment.eml"
+                    if eml_extension
+                    else f"{content_id}-attachmentName-demisto_untitled_attachment")
+        elif eml_extension and not attachment_name.endswith(".eml"):
+            return f'{content_id}-attachmentName-{attachment_name}.eml'
+        return f'{content_id}-attachmentName-{attachment_name}'
     if attachment_name is None or attachment_name == "":
-        return (f"{identifier_id}-attachmentName-demisto_untitled_attachment.eml"
-                if eml_extension
-                else f"{identifier_id}-attachmentName-demisto_untitled_attachment")
+        return "demisto_untitled_attachment.eml" if eml_extension else "demisto_untitled_attachment"
     elif eml_extension and not attachment_name.endswith(".eml"):
-        return f'{identifier_id}-attachmentName-{attachment_name}.eml'
-    return f'{identifier_id}-attachmentName-{attachment_name}'
+        return f'{attachment_name}.eml'
+    return attachment_name
 
 
 def get_entry_for_object(title, context_key, obj, headers=None):
@@ -892,7 +898,7 @@ def get_entry_for_file_attachment(item_id, attachment):
     :return: file entry dict for attachment
     """
     entry = fileResult(get_attachment_name(attachment_name=attachment.name, content_id=attachment.content_id,
-                       attachment_id=attachment.attachment_id.id), attachment.content)
+                       is_inline=attachment.is_inline), attachment.content)
     entry["EntryContext"] = {
         CONTEXT_UPDATE_EWS_ITEM_FOR_ATTACHMENT
         + CONTEXT_UPDATE_FILE_ATTACHMENT: parse_attachment_as_dict(item_id, attachment)
@@ -920,7 +926,7 @@ def parse_attachment_as_dict(item_id, attachment):
             ATTACHMENT_ID: attachment.attachment_id.id,
             "attachmentName": get_attachment_name(attachment_name=attachment.name,
                                                   content_id=attachment.content_id,
-                                                  attachment_id=attachment.attachment_id.id),
+                                                  is_inline=attachment.is_inline),
             "attachmentSHA256": hashlib.sha256(attachment_content).hexdigest()
             if attachment_content
             else None,
@@ -942,7 +948,7 @@ def parse_attachment_as_dict(item_id, attachment):
             ATTACHMENT_ID: attachment.attachment_id.id,
             "attachmentName": get_attachment_name(attachment_name=attachment.name,
                                                   content_id=attachment.content_id,
-                                                  attachment_id=attachment.attachment_id.id),
+                                                  is_inline=attachment.is_inline),
             "attachmentSHA256": None,
             "attachmentContentType": attachment.content_type,
             "attachmentContentId": attachment.content_id,
@@ -970,7 +976,7 @@ def get_entry_for_item_attachment(item_id, attachment, target_email):  # pragma:
         parse_item_as_dict(item, target_email, camel_case=True, compact_fields=True)
     )
     title = (f'EWS get attachment got item for "{target_email}", '
-             f'"{get_attachment_name(attachment_name=attachment.name, content_id=attachment.content_id, attachment_id=attachment.attachment_id.id)}"')  # noqa: E501
+             f'"{get_attachment_name(attachment_name=attachment.name, content_id=attachment.content_id, is_inline=attachment.is_inline)}"')  # noqa: E501
 
     return get_entry_for_object(
         title,
@@ -1076,31 +1082,28 @@ def fetch_attachments_for_message(
     attachments = client.get_attachments_for_item(item_id, account, attachment_ids)
     entries = []
     for attachment in attachments:
-        if (not identifiers_filter
-            or attachment.content_id in identifiers_filter
-                or attachment.attachment_id.id in identifiers_filter):
-            if isinstance(attachment, FileAttachment):
-                try:
-                    if attachment.content:
-                        entries.append(get_entry_for_file_attachment(item_id, attachment))
-                except TypeError as e:
-                    if str(e) != "must be string or buffer, not None":
-                        raise
-            else:
+        if isinstance(attachment, FileAttachment):
+            try:
+                if attachment.content:
+                    entries.append(get_entry_for_file_attachment(item_id, attachment))
+            except TypeError as e:
+                if str(e) != "must be string or buffer, not None":
+                    raise
+        else:
+            entries.append(
+                get_entry_for_item_attachment(
+                    item_id, attachment, account.primary_smtp_address
+                )
+            )
+            if attachment.item.mime_content:
                 entries.append(
-                    get_entry_for_item_attachment(
-                        item_id, attachment, account.primary_smtp_address
+                    fileResult(
+                        get_attachment_name(attachment_name=attachment.name, eml_extension=True,
+                                            content_id=attachment.content_id,
+                                            is_inline=attachment.is_inline),
+                        attachment.item.mime_content,
                     )
                 )
-                if attachment.item.mime_content:
-                    entries.append(
-                        fileResult(
-                            get_attachment_name(attachment_name=attachment.name, eml_extension=True,
-                                                content_id=attachment.content_id,
-                                                attachment_id=attachment.attachment_id.id),
-                            attachment.item.mime_content,
-                        )
-                    )
 
     return entries
 
@@ -2212,7 +2215,7 @@ def parse_incident_from_item(item):  # pragma: no cover
                         # save the attachment
                         file_name = get_attachment_name(attachment_name=attachment.name,
                                                         content_id=attachment.content_id,
-                                                        attachment_id=attachment.attachment_id.id)
+                                                        is_inline=attachment.is_inline)
                         demisto.debug(f"saving content number {attachment_counter}, "
                                       f"of size {sys.getsizeof(attachment.content)}, of email with id {item.id}")
                         file_result = fileResult(file_name, attachment.content)
@@ -2228,7 +2231,8 @@ def parse_incident_from_item(item):  # pragma: no cover
                                 "path": file_result["FileID"],
                                 "name": get_attachment_name(attachment_name=attachment.name,
                                                             content_id=attachment.content_id,
-                                                            attachment_id=attachment.attachment_id.id),
+                                                            is_inline=attachment.is_inline),
+                                "description": FileAttachmentType.ATTACHED if not attachment.is_inline else "",
                             }
                         )
                 except TypeError as e:
@@ -2289,7 +2293,7 @@ def parse_incident_from_item(item):  # pragma: no cover
                     data = decode_email_data(attached_email)
                     file_result = fileResult(get_attachment_name(attachment_name=attachment.name,
                                              eml_extension=True, content_id=attachment.content_id,
-                                             attachment_id=attachment.attachment_id.id), data)
+                                             is_inline=attachment.is_inline), data)
 
                 if file_result:
                     # check for error
@@ -2304,7 +2308,7 @@ def parse_incident_from_item(item):  # pragma: no cover
                             "name": get_attachment_name(attachment_name=attachment.name,
                                                         eml_extension=True,
                                                         content_id=attachment.content_id,
-                                                        attachment_id=attachment.attachment_id.id),
+                                                        is_inline=attachment.is_inline),
                         }
                     )
 
@@ -2313,7 +2317,7 @@ def parse_incident_from_item(item):  # pragma: no cover
                     "type": label_attachment_type,
                     "value": get_attachment_name(attachment_name=attachment.name,
                                                  content_id=attachment.content_id,
-                                                 attachment_id=attachment.attachment_id.id),
+                                                 is_inline=attachment.is_inline),
                 }
             )
             labels.append(
diff --git a/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.yml b/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.yml
index d7569957a0ed..5fdf52f65136 100644
--- a/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.yml
+++ b/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365.yml
@@ -165,6 +165,12 @@ configuration:
   section: Collect
   advanced: true
   required: false
+- display: Use legacy attachment name
+  name: legacy_name
+  section: Collect
+  type: 8
+  advanced: true
+  defaultvalue: 'false'
 description: The new EWS O365 integration uses OAuth 2.0 protocol and can be used with Exchange Online and Office 365 (mail).
 display: EWS O365
 name: EWSO365
@@ -179,10 +185,6 @@ script:
     - description: The attachments ids to get. If none - all attachments will be retrieve from the message. Support multiple attachments with comma-separated value or array.
       isArray: true
       name: attachment-ids
-    - description: Identifier ids to download to XSOAR (to avoid downloading all files to XSOAR during the preprocessing script).
-      hidden: true
-      name: identifiers-filter
-      required: false
     description: Retrieves the actual attachments from an item (email message). To get all attachments for a message, only specify the item-id argument.
     name: ews-get-attachment
     outputs:
diff --git a/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365_test.py b/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365_test.py
index 7e83bc902f16..c7372c94807d 100644
--- a/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365_test.py
+++ b/Packs/MicrosoftExchangeOnline/Integrations/EWSO365/EWSO365_test.py
@@ -581,7 +581,7 @@ def test_parse_incident_from_item(mocker, mime_content, expected_data, expected_
     assert incident["rawJSON"]
     raw_json = json.loads(incident["rawJSON"])
     assert raw_json['attachments'][0]['attachmentSHA256'] == expected_attachmentSHA256
-    mock_file_result.assert_called_once_with("None-attachmentName-demisto_untitled_attachment.eml", expected_data)
+    mock_file_result.assert_called_once_with("demisto_untitled_attachment.eml", expected_data)
 
 
 def test_parse_incident_from_item_with_attachments():
@@ -675,7 +675,7 @@ def test_parse_incident_from_item_with_eml_attachment_header_integrity(mocker):
     mock_file_result = mocker.patch('EWSO365.fileResult')
     parse_incident_from_item(message)
     # assert the fileResult is created with the expected results
-    mock_file_result.assert_called_once_with("None-attachmentName-demisto_untitled_attachment.eml", expected_data)
+    mock_file_result.assert_called_once_with("demisto_untitled_attachment.eml", expected_data)
 
 
 @pytest.mark.parametrize('params, expected_result', [
@@ -957,12 +957,46 @@ def test_handle_incorrect_message_id(message_id, expected_message_id_output):
     assert handle_incorrect_message_id(message_id) == expected_message_id_output
 
 
-@pytest.mark.parametrize("attachment_name, content_id, attachment_id, expected_result", [
-    pytest.param('image1.png', "", '123', "123-attachmentName-image1.png"),
-    pytest.param('image1.png', '123', '456', "123-attachmentName-image1.png"),
-    pytest.param('image1.png', None, '456', "456-attachmentName-image1.png"),
+@pytest.mark.parametrize("attachment_name, content_id, is_inline, expected_result", [
+    pytest.param('image1.png', "", False, "image1.png"),
+    pytest.param('image1.png', '123', True, "123-attachmentName-image1.png"),
+    pytest.param('image1.png', None, False, "image1.png"),
 
 ])
-def test_get_attachment_name(attachment_name, content_id, attachment_id, expected_result):
+def test_get_attachment_name(attachment_name, content_id, is_inline, expected_result):
+    """
+    Given:
+        - case 1: attachment is not inline.
+        - case 1: attachment is inline.
+        - case 3: attachment is not inline.
+    When:
+        - get_attachment_name is called with LEGACY_NAME=FALSE
+    Then:
+        Only case 2 should add an ID to the attachment name.
+
+    """
+    assert get_attachment_name(attachment_name=attachment_name, content_id=content_id,
+                               is_inline=is_inline) == expected_result
+
+
+@pytest.mark.parametrize("attachment_name, content_id, is_inline, expected_result", [
+    pytest.param('image1.png', "", False, "image1.png"),
+    pytest.param('image1.png', '123', True, "image1.png"),
+    pytest.param('image1.png', None, False, "image1.png"),
+
+])
+def test_get_attachment_name_legacy_name(monkeypatch, attachment_name, content_id, is_inline, expected_result):
+    """
+    Given:
+        - case 1: attachment is not inline.
+        - case 1: attachment is inline.
+        - case 3: attachment is not inline.
+    When:
+        - get_attachment_name is called with LEGACY_NAME=FALSE
+    Then:
+        All cases should not add an ID to the attachment name.
+
+    """
+    monkeypatch.setattr('EWSO365.LEGACY_NAME', True)
     assert get_attachment_name(attachment_name=attachment_name, content_id=content_id,
-                               attachment_id=attachment_id) == expected_result
+                               is_inline=is_inline) == expected_result
diff --git a/Packs/MicrosoftExchangeOnline/ReleaseNotes/1_4_4.md b/Packs/MicrosoftExchangeOnline/ReleaseNotes/1_4_4.md
new file mode 100644
index 000000000000..23f72b178eb2
--- /dev/null
+++ b/Packs/MicrosoftExchangeOnline/ReleaseNotes/1_4_4.md
@@ -0,0 +1,7 @@
+
+#### Integrations
+
+##### EWS O365
+
+- Added a Use Legacy Name configuration parameter in order to use the original attachment name.
+- Updated the attachment name to be in the following format: <the attachment ID\>-attachmentName-<the attachment name\> only if the attachment is inline and **Use Legacy Name** is disabled.
\ No newline at end of file
diff --git a/Packs/MicrosoftExchangeOnline/pack_metadata.json b/Packs/MicrosoftExchangeOnline/pack_metadata.json
index fa54df89644f..c2b3babc3a3c 100644
--- a/Packs/MicrosoftExchangeOnline/pack_metadata.json
+++ b/Packs/MicrosoftExchangeOnline/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Microsoft Exchange Online",
     "description": "Exchange Online and Office 365 (mail)",
     "support": "xsoar",
-    "currentVersion": "1.4.3",
+    "currentVersion": "1.4.4",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.py b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.py
index d86dc64a49e2..4231f860bdee 100644
--- a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.py
+++ b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.py
@@ -139,6 +139,7 @@ def main():     # pragma: no cover
     display_full_email_body = argToBoolean(params.get("display_full_email_body", "false"))
     mark_fetched_read = argToBoolean(params.get("mark_fetched_read", "false"))
     fetch_html_formatting = argToBoolean(params.get("fetch_html_formatting", "false"))
+    legacy_name = argToBoolean(params.get('legacy_name', False))
 
     # params related to self deployed
     tenant_id = refresh_token if self_deployed else ''
@@ -163,6 +164,7 @@ def main():     # pragma: no cover
         first_fetch_interval=first_fetch_interval,
         emails_fetch_limit=emails_fetch_limit,
         fetch_html_formatting=fetch_html_formatting,
+        legacy_name=legacy_name,
 
         refresh_token=refresh_token,
         auth_code=auth_code,
diff --git a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.yml b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.yml
index 41584895f8ba..d0631a42a78e 100644
--- a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.yml
+++ b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener.yml
@@ -184,6 +184,12 @@ configuration:
   section: Connect
   advanced: true
   required: false
+- display: Use legacy attachment name
+  name: legacy_name
+  section: Collect
+  type: 8
+  advanced: true
+  defaultvalue: 'false'
 description: Microsoft Graph grants Cortex XSOAR authorized access to a user's Microsoft Outlook mail data in a personal account or organization account.
 display: Microsoft Graph Mail Single User
 name: Microsoft Graph Mail Single User
@@ -648,10 +654,6 @@ script:
     - deprecated: true
       description: Flag for rate limit retry.
       name: ran_once_flag
-    - description: Identifier ids to download to XSOAR (to avoid downloading all files to XSOAR during the preprocessing script).
-      name: identifiers_filter
-      required: false
-      hidden: true
     outputs:
     - contextPath: File.Size
       description: The size of the file.
diff --git a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener_test.py b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener_test.py
index a5d694ec9759..6687c55062fa 100644
--- a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener_test.py
+++ b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphListener/MicrosoftGraphListener_test.py
@@ -755,7 +755,7 @@ def test_get_attachments_without_attachment_id(mocker, client):
     """
     from MicrosoftGraphListener import get_attachment_command
     file_attachments_result = {'2': 'f1145f66-90fe-4604-a7ea-faac8c33684e-attachmentName-image2.png',
-                               '3': 'exampleID3-attachmentName-image3.png'}
+                               '3': 'image3.png'}
     output_prefix = 'MSGraphMail(val.ID && val.ID == obj.ID)'
     with open('test_data/mail_with_attachments.txt') as mail_json:
         test_args = {}
@@ -1222,7 +1222,7 @@ def test_special_chars_in_attachment_name(mocker):
 
     res = client._get_email_attachments('message_id')
 
-    assert res[0].get('name') == f'123-attachmentName-{attachment_file_name}'
+    assert res[0].get('name') == attachment_file_name
 
 
 @pytest.mark.parametrize('attachment_file_name', ['1.png', 'file_example_JPG_100kB.jpg', 'sdsdagdsga.png'])
@@ -1243,7 +1243,7 @@ def test_regular_chars_in_attachment_name(mocker, attachment_file_name):
 
     res = client._get_email_attachments('message_id')
 
-    assert res[0].get('name') == f'1234-attachmentName-{attachment_file_name}'
+    assert res[0].get('name') == attachment_file_name
 
 
 @pytest.mark.parametrize('str_to_check, expected_result', [('slabiky, ale liší se podle významu', False),
@@ -1301,3 +1301,52 @@ def test_generate_login_url(mocker):
                    f'&client_id={client_id}&redirect_uri={redirect_uri}'
     res = MicrosoftGraphListener.return_results.call_args[0][0].readable_output
     assert expected_url in res
+
+
+@pytest.mark.parametrize("raw_attachment, legacy_name, expected_name, expect_exception", [
+    (
+        {'name': 'test.png', 'contentId': '123', 'isInline': True,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        False,
+        "123-attachmentName-test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': None, 'isInline': False,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        False,
+        "test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': '123', 'isInline': True,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        True,
+        "test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': 'None', 'isInline': True,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        False,
+        "test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': '123', 'isInline': True, 'contentBytes': 'invalid_base64'},
+        False,
+        None,
+        True
+    )
+])
+def test_file_result_creator(monkeypatch, raw_attachment, legacy_name, expected_name, expect_exception):
+    from MicrosoftGraphMailApiModule import GraphMailUtils
+    monkeypatch.setattr('MicrosoftGraphListener.fileResult', fileResult)
+    monkeypatch.setattr('MicrosoftGraphListener.DemistoException', DemistoException)
+
+    if expect_exception:
+        with pytest.raises(DemistoException):
+            GraphMailUtils.file_result_creator(raw_attachment, legacy_name)
+    else:
+        result = GraphMailUtils.file_result_creator(raw_attachment, legacy_name)
+        assert result['File'] == expected_name
diff --git a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.py b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.py
index 6a22668b5930..3914d0d4744a 100644
--- a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.py
+++ b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.py
@@ -158,6 +158,7 @@ def main():  # pragma: no cover
         display_full_email_body = argToBoolean(params.get("display_full_email_body", False))
         mark_fetched_read = argToBoolean(params.get("mark_fetched_read", "false"))
         look_back = arg_to_number(params.get('look_back', 0))
+        legacy_name = argToBoolean(params.get('legacy_name', False))
 
         client: MsGraphMailClient = MsGraphMailClient(
             self_deployed=self_deployed,
@@ -173,6 +174,7 @@ def main():  # pragma: no cover
             folder_to_fetch=folder_to_fetch,
             first_fetch_interval=first_fetch_interval,
             emails_fetch_limit=emails_fetch_limit,
+            legacy_name=legacy_name,
 
             timeout=timeout,
             endpoint=endpoint,
@@ -181,7 +183,8 @@ def main():  # pragma: no cover
             display_full_email_body=display_full_email_body,
             mark_fetched_read=mark_fetched_read,
             look_back=look_back,
-            managed_identities_client_id=managed_identities_client_id)
+            managed_identities_client_id=managed_identities_client_id
+        )
 
         command = demisto.command()
         LOG(f'Command being called is {command}')
diff --git a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.yml b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.yml
index a27c1bda36e2..de55a241571f 100644
--- a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.yml
+++ b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail.yml
@@ -185,6 +185,12 @@ configuration:
   section: Connect
   advanced: true
   required: false
+- display: Use legacy attachment name
+  name: legacy_name
+  section: Collect
+  type: 8
+  advanced: true
+  defaultvalue: 'false'
 description: Microsoft Graph lets your app get authorized access to a user's Outlook mail data in a personal or organization account.
 display: O365 Outlook Mail (Using Graph API)
 fromversion: 5.0.0
@@ -452,10 +458,6 @@ script:
     - deprecated: true
       description: flag for rate limit retry.
       name: ran_once_flag
-    - description: Identifier ids to download to XSOAR (to avoid downloading all files to XSOAR during the preprocessing script).
-      name: identifiers_filter
-      required: false
-      hidden: true
     description: Gets an attachment from the email.
     name: msgraph-mail-get-attachment
     outputs:
diff --git a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail_test.py b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail_test.py
index 0655136c41fa..44aa567ee821 100644
--- a/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail_test.py
+++ b/Packs/MicrosoftGraphMail/Integrations/MicrosoftGraphMail/MicrosoftGraphMail_test.py
@@ -82,7 +82,8 @@ def test_params_working(mocker, params, expected_results):
                                                       emails_fetch_limit=50, timeout=10, endpoint='com',
                                                       certificate_thumbprint='', private_key='',
                                                       display_full_email_body=False, mark_fetched_read=False, look_back=0,
-                                                      managed_identities_client_id=None)
+                                                      managed_identities_client_id=None,
+                                                      legacy_name=False)
 
 
 def test_build_mail_object():
@@ -673,7 +674,7 @@ def test_get_attachments_without_attachment_id(mocker, client):
     """
     from MicrosoftGraphMail import get_attachment_command
     file_attachments_result = {'2': 'f1145f66-90fe-4604-a7ea-faac8c33684e-attachmentName-image2.png',
-                               '3': 'exampleID3-attachmentName-image3.png'}
+                               '3': 'image3.png'}
     output_prefix = 'MSGraphMail(val.ID && val.ID == obj.ID)'
     with open('test_data/mail_with_attachments') as mail_json:
         user_id = 'ex@example.com'
@@ -1405,3 +1406,52 @@ def test_test_module_command_with_managed_identities(mocker, requests_mock, clie
     qs = get_mock.last_request.qs
     assert qs['resource'] == [Resources.graph]
     assert client_id and qs['client_id'] == [client_id] or 'client_id' not in qs
+
+
+@pytest.mark.parametrize("raw_attachment, legacy_name, expected_name, expect_exception", [
+    (
+        {'name': 'test.png', 'contentId': '123', 'isInline': True,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        False,
+        "123-attachmentName-test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': None, 'isInline': False,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        False,
+        "test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': '123', 'isInline': True,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        True,
+        "test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': 'None', 'isInline': True,
+            'contentBytes': base64.b64encode(b'test data').decode('utf-8')},
+        False,
+        "test.png",
+        False
+    ),
+    (
+        {'name': 'test.png', 'contentId': '123', 'isInline': True, 'contentBytes': 'invalid_base64'},
+        False,
+        None,
+        True
+    )
+])
+def test_file_result_creator(monkeypatch, raw_attachment, legacy_name, expected_name, expect_exception):
+    from MicrosoftGraphMailApiModule import GraphMailUtils
+    monkeypatch.setattr('MicrosoftGraphMail.fileResult', fileResult)
+    monkeypatch.setattr('MicrosoftGraphMail.DemistoException', DemistoException)
+
+    if expect_exception:
+        with pytest.raises(DemistoException):
+            GraphMailUtils.file_result_creator(raw_attachment, legacy_name)
+    else:
+        result = GraphMailUtils.file_result_creator(raw_attachment, legacy_name)
+        assert result['File'] == expected_name
diff --git a/Packs/MicrosoftGraphMail/ReleaseNotes/1_6_13.md b/Packs/MicrosoftGraphMail/ReleaseNotes/1_6_13.md
new file mode 100644
index 000000000000..421427a3e92f
--- /dev/null
+++ b/Packs/MicrosoftGraphMail/ReleaseNotes/1_6_13.md
@@ -0,0 +1,12 @@
+
+#### Integrations
+
+##### Microsoft Graph Mail Single User
+
+- Added a Use Legacy Name configuration parameter in order to use the original attachment name.
+- Updated the attachment name to be in the following format: <the attachment ID\>-attachmentName-<the attachment name\> only if the attachment is inline and **Use Legacy Name** is disabled.
+
+##### O365 Outlook Mail (Using Graph API)
+
+- Added a Use Legacy Name configuration parameter in order to use the original attachment name.
+- Updated the attachment name to be in the following format: <the attachment ID\>-attachmentName-<the attachment name\> only if the attachment is inline and **Use Legacy Name** is disabled.
diff --git a/Packs/MicrosoftGraphMail/pack_metadata.json b/Packs/MicrosoftGraphMail/pack_metadata.json
index 367ab6173b79..ca25f81681bb 100644
--- a/Packs/MicrosoftGraphMail/pack_metadata.json
+++ b/Packs/MicrosoftGraphMail/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Microsoft Graph Mail",
     "description": "Microsoft Graph lets your app get authorized access to a user's Outlook mail data in a personal or organization account.",
     "support": "xsoar",
-    "currentVersion": "1.6.12",
+    "currentVersion": "1.6.13",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2.yml b/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2.yml
index 380afe9ca243..cd528ee20747 100644
--- a/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2.yml
+++ b/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2.yml
@@ -185,6 +185,9 @@ tasks:
       '#none#':
       - "5"
     scriptarguments:
+      format:
+        complex:
+          root: inputs.ReportFileType
       url:
         complex:
           root: WildFire
@@ -234,6 +237,12 @@ tasks:
         complex:
           root: inputs.URL
           transformers:
+          - operator: URLEncode
+            args:
+              ignore_safe_character: {}
+              safe_character:
+                value:
+                  simple: :/
           - operator: uniq
     separatecontext: false
     continueonerrortype: ""
diff --git a/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2_README.md b/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2_README.md
index 967b9a3d6d78..14c8ea73333f 100644
--- a/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2_README.md
+++ b/Packs/Palo_Alto_Networks_WildFire/Playbooks/Detonate_URL_-_WildFire_v2.2_README.md
@@ -31,9 +31,9 @@ This playbook does not use any scripts.
 | **Name** | **Description** | **Default Value** | **Required** |
 | --- | --- | --- | --- |
 | URL | URL of the webpage or file url to detonate. The URL is taken from the context. | URL.Data | Optional |
-| Interval | Duration for executing the polling \(in seconds\). | 1 | Optional |
-| Timeout | The duration after which to stop polling and to resume the playbook \(in seconds\). | 8 | Optional |
-| ReportFileType | The resource type to download. Default is PDF. XML is also possible. |  | Optional |
+| Interval | Duration for executing the polling \(in seconds\). | 60 | Optional |
+| Timeout | The duration after which to stop polling and to resume the playbook \(in seconds\). | 600 | Optional |
+| ReportFileType | The resource type to download. Values: PDF (default), XML. |  | Optional |
 
 ## Playbook Outputs
 
@@ -86,4 +86,4 @@ This playbook does not use any scripts.
 
 ---
 
-![Detonate URL - WildFire v2.2](../doc_files/Detonate_URL_-_WildFire_v2_2.png)
+![Detonate URL - WildFire v2.2](../doc_files/Detonate_URL_-_WildFire_v2.2.png)
diff --git a/Packs/Palo_Alto_Networks_WildFire/ReleaseNotes/2_1_49.md b/Packs/Palo_Alto_Networks_WildFire/ReleaseNotes/2_1_49.md
new file mode 100644
index 000000000000..942ed836f3f7
--- /dev/null
+++ b/Packs/Palo_Alto_Networks_WildFire/ReleaseNotes/2_1_49.md
@@ -0,0 +1,7 @@
+
+#### Playbooks
+
+##### Detonate URL - WildFire v2.2
+
+- Added ReportFileType input to return a report task.
+- Added transformer to support encoded URLs.
diff --git a/Packs/Palo_Alto_Networks_WildFire/pack_metadata.json b/Packs/Palo_Alto_Networks_WildFire/pack_metadata.json
index e99cc70be455..c8f883843ce3 100644
--- a/Packs/Palo_Alto_Networks_WildFire/pack_metadata.json
+++ b/Packs/Palo_Alto_Networks_WildFire/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "WildFire by Palo Alto Networks",
     "description": "Perform malware dynamic analysis",
     "support": "xsoar",
-    "currentVersion": "2.1.48",
+    "currentVersion": "2.1.49",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/QRadar/Playbooks/playbook-QRadar_Generic.yml b/Packs/QRadar/Playbooks/playbook-QRadar_Generic.yml
index 0d79ee5f4bef..708a6ee7e1d2 100644
--- a/Packs/QRadar/Playbooks/playbook-QRadar_Generic.yml
+++ b/Packs/QRadar/Playbooks/playbook-QRadar_Generic.yml
@@ -1001,6 +1001,17 @@ tasks:
           right:
             value:
               simple: "true"
+      - - operator: isNotEmpty
+          left:
+            value:
+              simple: incident.starttime
+            iscontext: true
+      - - operator: isNotEmpty
+          left:
+            value:
+              simple: incident.idoffense
+            iscontext: true
+    continueonerrortype: ""
     view: |-
       {
         "position": {
diff --git a/Packs/QRadar/ReleaseNotes/2_5_2.md b/Packs/QRadar/ReleaseNotes/2_5_2.md
new file mode 100644
index 000000000000..dbc6075d215b
--- /dev/null
+++ b/Packs/QRadar/ReleaseNotes/2_5_2.md
@@ -0,0 +1,6 @@
+
+#### Playbooks
+
+##### QRadar Generic
+
+Added conditions to the task "Run additional searches?" to avoid playbook errors.
\ No newline at end of file
diff --git a/Packs/QRadar/pack_metadata.json b/Packs/QRadar/pack_metadata.json
index b04c52c48130..1440ed7f24a4 100644
--- a/Packs/QRadar/pack_metadata.json
+++ b/Packs/QRadar/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "IBM QRadar",
     "description": "Fetch offenses as incidents and search QRadar",
     "support": "xsoar",
-    "currentVersion": "2.5.1",
+    "currentVersion": "2.5.2",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.py b/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.py
index ee53bcc7674e..6af1311a4051 100644
--- a/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.py
+++ b/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.py
@@ -448,6 +448,7 @@ def list_endpoint(
         view: Optional[str],
         limit: Optional[int],
         ip_addresses: Optional[List[str]],
+        hostname_contains: Optional[str]
     ) -> dict:
         """
         List all endpoints for a tenant.
@@ -463,6 +464,8 @@ def list_endpoint(
             view (str): Type of view to be returned in the response.
             limit (int): Max number of endpoints to return.
             ip_addresses (list(str)): Find endpoints by IP addresses.
+            hostname_contains (str): Find endpoints where the hostname contains the given string.
+                Only the first 10 characters of the given string are matched.
 
         Returns:
             response (Response): API response from Sophos.
@@ -478,6 +481,7 @@ def list_endpoint(
             "view": view,
             "pageSize": limit,
             "ipAddresses": ip_addresses,
+            "hostnameContains": hostname_contains
         }
         params = remove_empty_elements(params)
         url_suffix = "endpoint/v1/endpoints"
@@ -2009,8 +2013,10 @@ def sophos_central_endpoint_list_command(client: Client, args: dict) -> CommandR
         args.get("view"),
         min(int(args.get("limit", "")), 100),
         argToList(args.get("ip_addresses")),
+        args.get("hostname_contains")
     )
     full_match_ip = argToBoolean(args.get("full_match_ip", "false"))
+    full_match_hostname = argToBoolean(args.get("full_match_hostname", "false"))
     items = results.get("items")
     table_headers = [
         "id",
@@ -2037,6 +2043,13 @@ def sophos_central_endpoint_list_command(client: Client, args: dict) -> CommandR
                 matching_ips = [ip for ip in query_ips if ip in ips]
                 if not matching_ips:
                     continue
+
+            # The Sophos API does partial string matching, which can be unwanted for hostnames.
+            if full_match_hostname and (
+                object_data.get("hostname") is None or object_data.get("hostname") != args.get("hostname_contains")
+            ):
+                continue
+
             assigned_products = item.get("assignedProducts")
             if assigned_products:
                 object_data["assignedProductCodes"] = [
diff --git a/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.yml b/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.yml
index 119d6aefc678..52555c092ec4 100644
--- a/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.yml
+++ b/Packs/SophosCentral/Integrations/SophosCentral/SophosCentral.yml
@@ -446,12 +446,20 @@ script:
     - name: ip_addresses
       isArray: true
       description: 'List of IP addresses to find endpoints for.'
+    - name: hostname_contains
+      description: Find endpoints where the hostname contains the given string. Only the first 10 characters of the given string are matched.
     - auto: PREDEFINED
       name: full_match_ip
       description: 'Whether the IP addresses should match full or not (partial/default).'
       predefined:
       - 'true'
       - 'false'
+    - auto: PREDEFINED
+      name: full_match_hostname
+      description: 'Whether the hostname should match full or not (partial/default).'
+      predefined:
+      - 'true'
+      - 'false'
     description: List all endpoints for a tenant.
     name: sophos-central-endpoint-list
     outputs:
diff --git a/Packs/SophosCentral/ReleaseNotes/1_3_2.md b/Packs/SophosCentral/ReleaseNotes/1_3_2.md
new file mode 100644
index 000000000000..f08748286603
--- /dev/null
+++ b/Packs/SophosCentral/ReleaseNotes/1_3_2.md
@@ -0,0 +1,4 @@
+#### Integrations
+##### Sophos Central
+- Added new argument to ***sophos-central-endpoint-list*** to query endpoints by IP hostname
+- Added new argument to ***sophos-central-endpoint-list*** to check hostname for full match instead of partial (default API behavior).
diff --git a/Packs/SophosCentral/pack_metadata.json b/Packs/SophosCentral/pack_metadata.json
index 76a6ec32f716..2f38cdb7009c 100644
--- a/Packs/SophosCentral/pack_metadata.json
+++ b/Packs/SophosCentral/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Sophos Central",
     "description": "The unified console for managing Sophos products",
     "support": "xsoar",
-    "currentVersion": "1.3.1",
+    "currentVersion": "1.3.2",
     "author": "Sophos",
     "url": "",
     "email": "",
diff --git a/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy.py b/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy.py
index be939d3448fe..24fe4ad2f161 100644
--- a/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy.py
+++ b/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy.py
@@ -951,6 +951,19 @@ def get_notable_field_and_value(raw_field, notable_data, raw=None):
     return "", ""
 
 
+def remove_double_quotes(query: str) -> str:
+    """
+        query (str): query with double double quotes.
+
+        Return: query with no double double quotes. Example: "this is a ""test""\" -> "this is a "test""
+    """
+    # Regular expression to match two consecutive quotation marks with any character(s) in between
+    pattern = re.compile(r'""(.*?)""')
+
+    # Substitute the pattern with single quotes around the matched content
+    return pattern.sub(r'"\1"', query)
+
+
 def build_drilldown_search(notable_data, search, raw_dict, is_query_name=False):
     """ Replaces all needed fields in a drilldown search query, or a search query name
     Args:
@@ -992,8 +1005,9 @@ def build_drilldown_search(notable_data, search, raw_dict, is_query_name=False):
     searchable_search.append(search[start:])  # Handling the tail of the query
 
     parsed_query = ''.join(searchable_search)
+
     # Avoiding double quotes in splunk variables that were surrounded by quotation marks in the original query (ex: '"$user|s"')
-    parsed_query = parsed_query.replace('""', '"')
+    parsed_query = remove_double_quotes(parsed_query)
     demisto.debug(f"Parsed query is: {parsed_query}")
 
     return parsed_query
diff --git a/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy_test.py b/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy_test.py
index 1b5af4851f24..0a748c389fb9 100644
--- a/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy_test.py
+++ b/Packs/SplunkPy/Integrations/SplunkPy/SplunkPy_test.py
@@ -102,9 +102,9 @@
         '_cd': '668:17198',
         '_indextime': '1596545116',
         '_raw': '1596545116, search_name="Endpoint - Recurring Malware Infection - Rule", count="17", '
-        'day_count="8", dest="ACME-workstation-012", info_max_time="1596545100.000000000", '
-        'info_min_time="1595939700.000000000", info_search_time="1596545113.965466000", '
-        'signature="Trojan.Gen.2"',
+                'day_count="8", dest="ACME-workstation-012", info_max_time="1596545100.000000000", '
+                'info_min_time="1595939700.000000000", info_search_time="1596545113.965466000", '
+                'signature="Trojan.Gen.2"',
         '_serial': '50',
         '_si': ['ip-172-31-44-193', 'notable'],
         '_sourcetype': 'stash',
@@ -350,6 +350,7 @@ def test_splunk_submit_event_hec_command(mocker):
     class MockRes:
         def __init__(self, text):
             self.text = text
+
     mocker.patch.object(splunk, "splunk_submit_event_hec", return_value=MockRes(text))
     return_error_mock = mocker.patch(RETURN_ERROR_TARGET)
     splunk.splunk_submit_event_hec_command(params={"hec_url": "mock_url"}, args={})
@@ -496,7 +497,6 @@ def test_commands(search_result, chosen_fields, expected_result):
 
 @pytest.mark.parametrize('args, out_error', data_test_check_error)
 def test_check_error(args, out_error):
-
     class Service:
         def __init__(self):
             self.apps = APPS
@@ -591,7 +591,6 @@ def test_get_key_type(keys_and_types, expected_type, mocker):
 
 @pytest.mark.parametrize('raw_keys, expected_keys', data_test_get_keys_and_types)
 def test_get_keys_and_types(raw_keys, expected_keys):
-
     class KVMock:
         def __init__(self):
             pass
@@ -630,7 +629,6 @@ def __init__(self):
 
 
 class TestFetchRemovingIrrelevantIncidents:
-
     notable1 = {'status': '5', 'event_id': '3'}
     notable2 = {'status': '6', 'event_id': '4'}
 
@@ -891,7 +889,7 @@ def test_fetch_notables(mocker):
     mocker.patch.object(splunk.client.Job, 'is_done', return_value=True)
     mocker.patch.object(splunk.client.Job, 'results', return_value=None)
     mocker.patch.object(splunk, 'ENABLED_ENRICHMENTS', [splunk.ASSET_ENRICHMENT,
-                        splunk.DRILLDOWN_ENRICHMENT, splunk.IDENTITY_ENRICHMENT])
+                                                        splunk.DRILLDOWN_ENRICHMENT, splunk.IDENTITY_ENRICHMENT])
     mocker.patch.object(demisto, 'incidents')
     mocker.patch.object(demisto, 'setLastRun')
     mock_last_run = {'time': '2018-10-24T14:13:20'}
@@ -1112,7 +1110,10 @@ def test_get_notable_field_and_value(raw_field, notable_data, expected_field, ex
     ({'user': 'test\crusher'}, 'index="test" | where user = $user|s$', {}, False,
      'index="test" | where user = "test\\\\crusher"'),
     ({'user': 'test\crusher'}, 'index="test" | where user = "$user|s$"', {}, False,
-     'index="test" | where user = "test\\\\crusher"')
+     'index="test" | where user = "test\\\\crusher"'),
+    ({'countryNameA': '"test\country"', 'countryNameB': '""'},
+     'search countryA="$countryNameA|s$" countryB=$countryNameB|s$', {}, False,
+     'search countryA="test\country" countryB=""'),
 ], ids=[
     "search query fields in notables data and raw data",
     "search query fields in notable data more than one value",
@@ -1121,7 +1122,9 @@ def test_get_notable_field_and_value(raw_field, notable_data, expected_field, ex
     "query name fields in raw data",
     "query name without fields to replace",
     "search query with a user field that contains a backslash",
-    "search query with a user field that is surrounded by quotation marks and contains a backslash"
+    "search query with a user field that is surrounded by quotation marks and contains a backslash",
+    "search query fields in notable data more than one value, with one empty value"
+
 ])
 def test_build_drilldown_search(notable_data, search, raw, is_query_name, expected_search, mocker):
     """
@@ -1185,8 +1188,8 @@ def test_get_fields_query_part(notable_data, prefix, fields, query_part):
       splunk.Enrichment(splunk.ASSET_ENRICHMENT, enrichment_id='2'),
       splunk.Enrichment(splunk.IDENTITY_ENRICHMENT, enrichment_id='3')], 1),
     ([splunk.Enrichment(splunk.ASSET_ENRICHMENT, enrichment_id='1'),
-        splunk.Enrichment(splunk.ASSET_ENRICHMENT, enrichment_id='2'),
-        splunk.Enrichment(splunk.IDENTITY_ENRICHMENT, enrichment_id='3')], 0)
+      splunk.Enrichment(splunk.ASSET_ENRICHMENT, enrichment_id='2'),
+      splunk.Enrichment(splunk.IDENTITY_ENRICHMENT, enrichment_id='3')], 0)
 ], ids=[
     "A Notable with 3 drilldown enrichments",
     "A Notable with 1 drilldown enrichment, 1 asset enrichment and 1 identity enrichment",
@@ -1312,8 +1315,8 @@ def test_to_incident_notable_enrichments_data(enrichments, expected_data):
      ),
     ([splunk.Enrichment(splunk.DRILLDOWN_ENRICHMENT, enrichment_id='1', status=splunk.Enrichment.FAILED,
                         data=[{'result1': 'a'}, {'result2': 'b'}]),
-        splunk.Enrichment(splunk.DRILLDOWN_ENRICHMENT, enrichment_id='1', status=splunk.Enrichment.SUCCESSFUL,
-                          data=[{'result1': 'a'}, {'result2': 'b'}])], splunk.DRILLDOWN_ENRICHMENT, True
+      splunk.Enrichment(splunk.DRILLDOWN_ENRICHMENT, enrichment_id='1', status=splunk.Enrichment.SUCCESSFUL,
+                        data=[{'result1': 'a'}, {'result2': 'b'}])], splunk.DRILLDOWN_ENRICHMENT, True
      ),
     ([splunk.Enrichment(splunk.DRILLDOWN_ENRICHMENT, enrichment_id='1', status=splunk.Enrichment.FAILED,
                         data=[{'result1': 'a'}, {'result2': 'b'}]),
@@ -1420,7 +1423,7 @@ def test_parse_drilldown_searches():
          },
         {'name': "View related '$category$' events for $signature$",
          'search': '| from datamodel:"Malware"."Malware_Attacks" \n|  fields category, dest, signature | search dest=$dest|s$ '
-         'signature=$signature|s$',
+                   'signature=$signature|s$',
          'earliest': 1714563300,
          'latest': 1715168700
          }
@@ -1470,7 +1473,7 @@ def test_drilldown_enrichment_main_condition(mocker, notable_data, expected_call
     ({'event_id': 'test_id',
       'drilldown_searches':
           ["{\"name\":\"View related '$signature$' events for $dest$\",\"search\":\"| from datamodel:\\\"Malware\\\".\\\"Malwa"
-              "re_Attacks\\\" | search dest=$dest|s$ signature=$signature|s$\",\"earliest\":1714563300,\"latest\":1715168700}",
+           "re_Attacks\\\" | search dest=$dest|s$ signature=$signature|s$\",\"earliest\":1714563300,\"latest\":1715168700}",
            "{\"name\":\"View related '$category$' events for $signature$\",\"search\":\"| from datamodel:\\\"Malware\\\".\\\"M"
            "alware_Attacks\\\" \\n|  fields category, dest, signature | search dest=$dest|s$ signature=$signature|s$\",\"ear"
            "liest\":1714563300,\"latest\":1715168700}"
@@ -1513,7 +1516,8 @@ def test_drilldown_enrichment_get_timeframe(mocker, notable_data, expected_call_
     ({'event_id': 'test_id', 'drilldown_name': 'View all login attempts by system $src$',
       'drilldown_search': "| from datamodel:\"Authentication\".\"Authentication\" | search src=$src|s$",
       'drilldown_searches': "{\"name\":\"View all login attempts by system $src$\",\"search\":\"| from datamodel:\\\"Authent"
-      "ication\\\".\\\"Authentication\\\" | search src=$src|s$\",\"earliest\":1715040000,\"latest\":1715126400}",
+                            "ication\\\".\\\"Authentication\\\" | search src=$src|s$\",\"earliest\":1715040000,"
+                            "\"latest\":1715126400}",
       '_raw': "src=\'test_src\'", "drilldown_latest": "1715126400.000000000", "drilldown_earliest": "1715040000.000000000"},
      [
          ("View all login attempts by system 'test_src'",
@@ -1521,8 +1525,8 @@ def test_drilldown_enrichment_get_timeframe(mocker, notable_data, expected_call_
 
     ({'event_id': 'test_id2', 'drilldown_searches':
         ["{\"name\":\"View all login attempts by system $src$\",\"search\":\"| from datamodel:\\\"Authentication\\\".\\\"Authe"
-            "ntication\\\" | search src=$src|s$\",\"earliest\":1715040000,\"latest\":1715126400}",
-            "{\"name\":\"View all test involving user=\\\"$user$\\\"\",\"search\":\"index=\\\"test\\\"\\n| where "
+         "ntication\\\" | search src=$src|s$\",\"earliest\":1715040000,\"latest\":1715126400}",
+         "{\"name\":\"View all test involving user=\\\"$user$\\\"\",\"search\":\"index=\\\"test\\\"\\n| where "
          "user = $user|s$\",\"earliest\":1716955500,\"latest\":1716959400}"],
       '_raw': "src=\'test_src\', user='test_user'"},
      [("View all login attempts by system 'test_src'",
@@ -1531,8 +1535,8 @@ def test_drilldown_enrichment_get_timeframe(mocker, notable_data, expected_call_
        'search index="test"\n| where user = "\'test_user\'"')]),
     ({'event_id': 'test_id3', 'drilldown_searches':
         ["{\"name\":\"View all login attempts by system $src$\",\"search\":\"| from datamodel:\\\"Authentication\\\".\\\"Authe"
-            "ntication\\\" | search src=$src|s$\",\"earliest_offset\":1715040000,\"latest_offset\":1715126400}",
-            "{\"name\":\"View all test involving user=\\\"$user$\\\"\",\"search\":\"index=\\\"test\\\"\\n| where "
+         "ntication\\\" | search src=$src|s$\",\"earliest_offset\":1715040000,\"latest_offset\":1715126400}",
+         "{\"name\":\"View all test involving user=\\\"$user$\\\"\",\"search\":\"index=\\\"test\\\"\\n| where "
          "user = $user|s$\",\"earliest_offset\":1716955500,\"latest_offset\":1716959400}"],
       '_raw': "src=\'test_src\', user='test_user'"},
      [("View all login attempts by system 'test_src'",
@@ -1588,16 +1592,16 @@ def test_drilldown_enrichment(notable_data, expected_result):
           "{\"name\":\"View all login attempts by system $src$\",\"search\":\"| from datamodel:\\\"Authentica"
           "tion\\\".\\\"Authentication\\\" | search src=$src|s$\",\"earliest\":\"\",\"latest\":\"\"}",
           "{\"name\":\"View all test involving user=\\\"$user$\\\"\",\"search\":\"index=\\\"test\\\"\\n| where user ="
-                  "$user|s$\",\"earliest\":\"\",\"latest\":\"\"}"],
+          "$user|s$\",\"earliest\":\"\",\"latest\":\"\"}"],
       '_raw': "src=\'test_src\', user='test_user'"},
      'Failed getting the drilldown timeframe for notable test_id'),
 
     ({'event_id': 'test_id',
       'drilldown_searches':
           ["{\"name\":\"View all login attempts by system $src$\",\"search\":\"| from datamodel:\\\"Authentic"
-              "ation\\\".\\\"Authentication\\\" | search src=$src|s$\",\"earliest\":\"\",\"latest\":\"\"}",
-              "{\"name\":\"View all test involving user=\\\"$user$\\\"\",\"search\":\"index=\\\"test\\\"\\n| where user ="
-                  "$user|s$\",\"earliest\":\"\",\"latest\":\"\"}"], '_raw': ""},
+           "ation\\\".\\\"Authentication\\\" | search src=$src|s$\",\"earliest\":\"\",\"latest\":\"\"}",
+           "{\"name\":\"View all test involving user=\\\"$user$\\\"\",\"search\":\"index=\\\"test\\\"\\n| where user ="
+           "$user|s$\",\"earliest\":\"\",\"latest\":\"\"}"], '_raw': ""},
      "Couldn't build search query for notable test_id with the following drilldown search"),
 ], ids=[
     "A notable data without drilldown enrichment data",
@@ -1833,6 +1837,7 @@ def test_get_remote_data_command_with_message(mocker):
     Returns:
         None
     """
+
     class Jobs:
         def oneshot(self, _, output_mode: str):
             assert output_mode == splunk.OUTPUT_MODE_JSON
@@ -1900,6 +1905,7 @@ def test_get_remote_data_command_add_comment(mocker, notable_data: dict,
         - ensure the event was updated
 
     """
+
     class Jobs:
         def oneshot(self, _, output_mode: str):
             assert output_mode == splunk.OUTPUT_MODE_JSON
@@ -1998,7 +2004,6 @@ def test_edit_notable_event__failed_to_update(mocker, requests_mock):
      5, True)
 ])
 def test_update_remote_system(args, params, call_count, success, mocker, requests_mock):
-
     class Service:
         def __init__(self):
             self.token = 'fake_token'
@@ -2347,6 +2352,7 @@ def test_module__exception_raised(mocker, credentials):
     Then:
         - Validate the expected message was returned
     """
+
     # prepare
     def exception_raiser():
         raise AuthenticationError
@@ -2515,6 +2521,7 @@ def test_owner_mapping_mechanism_xsoar_to_splunk(mocker, xsoar_name, expected_sp
     Then:
         - validates the splunk user is correct
     """
+
     def mocked_get_record(col, value_to_search):
         return filter(lambda x: x[col] == value_to_search, OWNER_MAPPING[:-1])
 
@@ -2554,6 +2561,7 @@ def test_owner_mapping_mechanism_splunk_to_xsoar(mocker, splunk_name, expected_x
     Then:
         - validates the splunk user is correct
     """
+
     def mocked_get_record(col, value_to_search):
         return filter(lambda x: x[col] == value_to_search, OWNER_MAPPING)
 
@@ -2599,6 +2607,7 @@ def test_get_splunk_user_by_xsoar_command(mocker, xsoar_names, expected_outputs)
     When: trying to get splunk matching users
     Then: validates correctness of list
     """
+
     def mocked_get_record(col, value_to_search):
         return filter(lambda x: x[col] == value_to_search, OWNER_MAPPING[:-1])
 
@@ -2741,3 +2750,15 @@ def test_get_drilldown_searches(drilldown_data, expected):
     """
 
     assert splunk.get_drilldown_searches(drilldown_data) == expected
+
+
+def test_remove_double_quotes():
+    """
+        Given: string with double quotes
+        When: replacing a var in a query
+        Then: make sure no double double quotes are returned.
+    """
+    from SplunkPy import remove_double_quotes
+
+    assert remove_double_quotes('this is a ""test""') == 'this is a "test"'
+    assert remove_double_quotes('no ""double quotes"" here, and here: ""') == 'no "double quotes" here, and here: ""'
diff --git a/Packs/SplunkPy/ReleaseNotes/3_1_36.md b/Packs/SplunkPy/ReleaseNotes/3_1_36.md
new file mode 100644
index 000000000000..6506f32724b6
--- /dev/null
+++ b/Packs/SplunkPy/ReleaseNotes/3_1_36.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### SplunkPy
+
+- Fixed an issue where drilldown search queries were parsed incorrectly.
diff --git a/Packs/SplunkPy/pack_metadata.json b/Packs/SplunkPy/pack_metadata.json
index 0b238163c73e..aa44aece1d0a 100644
--- a/Packs/SplunkPy/pack_metadata.json
+++ b/Packs/SplunkPy/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Splunk",
     "description": "Run queries on Splunk servers.",
     "support": "xsoar",
-    "currentVersion": "3.1.35",
+    "currentVersion": "3.1.36",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/TeamCymru/Author_image.png b/Packs/TeamCymru/Author_image.png
new file mode 100644
index 000000000000..307f0ec6d7e8
Binary files /dev/null and b/Packs/TeamCymru/Author_image.png differ
diff --git a/Packs/TeamCymru/README.md b/Packs/TeamCymru/README.md
index 72fa76aa8afe..bc8e270fee9e 100644
--- a/Packs/TeamCymru/README.md
+++ b/Packs/TeamCymru/README.md
@@ -1,4 +1,4 @@
-Note: Support for this Pack will be moved to Partner starting July 28, 2024.
+Note: Support for this Pack was moved to Partner starting July 29, 2024. In case of any issues arise, please contact the Partner directly at <support@cymru.com>.
 
 Team Cymru provides various service options dedicated to mapping IP numbers to BGP prefixes and ASNs. Each of the services is based on the same BGP feeds from 50+ BGP peers and is updated at 4-hour intervals.
 
diff --git a/Packs/TeamCymru/ReleaseNotes/1_0_24.md b/Packs/TeamCymru/ReleaseNotes/1_0_24.md
new file mode 100644
index 000000000000..0ada3ee0d789
--- /dev/null
+++ b/Packs/TeamCymru/ReleaseNotes/1_0_24.md
@@ -0,0 +1,3 @@
+## Team Cymru
+
+- Completed adoption process.
diff --git a/Packs/TeamCymru/pack_metadata.json b/Packs/TeamCymru/pack_metadata.json
index eb8d457316ab..b31fdf0104b0 100644
--- a/Packs/TeamCymru/pack_metadata.json
+++ b/Packs/TeamCymru/pack_metadata.json
@@ -1,11 +1,11 @@
 {
     "name": "Team Cymru",
     "description": "Team Cymru is an internet security firm that offers research services making the internet a more secure place.",
-    "support": "xsoar",
-    "currentVersion": "1.0.23",
-    "author": "Cortex XSOAR",
-    "url": "https://www.paloaltonetworks.com/cortex",
-    "email": "",
+    "support": "partner",
+    "currentVersion": "1.0.24",
+    "author": "Team Cymru",
+    "url": "",
+    "email": "support@cymru.com",
     "categories": [
         "Data Enrichment & Threat Intelligence"
     ],
diff --git a/Packs/VirusTotal/Integrations/VirusTotalV3/README.md b/Packs/VirusTotal/Integrations/VirusTotalV3/README.md
index f59364524646..1d25118031b8 100644
--- a/Packs/VirusTotal/Integrations/VirusTotalV3/README.md
+++ b/Packs/VirusTotal/Integrations/VirusTotalV3/README.md
@@ -124,10 +124,10 @@ The following lists the changes in this version according to the commands from t
   additional information as *last_analysis_results* which contains the service name and its specific analysis.
 - Reputation commands can return relationships of the indicator.
   The relationships that are supported are defined as part of the instance configuration.
-  For more information regarding URL relationships, see: <https://developers.virustotal.com/v3.0/reference#url-object>
-  For more information regarding IP relationships, see: <https://developers.virustotal.com/v3.0/reference#ip-object>
-  For more information regarding Domain relationships, see: <https://developers.virustotal.com/v3.0/reference#domains-1>
-  For more information regarding File relationships, see: <https://developers.virustotal.com/v3.0/reference#files>
+  For more information regarding URL relationships, see: <https://docs.virustotal.com/reference/url-object>
+  For more information regarding IP relationships, see: <https://docs.virustotal.com/reference/ip-object>
+  For more information regarding Domain relationships, see: <https://docs.virustotal.com/reference/domains-object>
+  For more information regarding File relationships, see: <https://docs.virustotal.com/reference/files>
 
 - Starting with XSOAR version 6.8.0, You may monitor API usage via the *VirusTotal API Execution Metrics* dashboard.
 ### Comments
diff --git a/Packs/VirusTotal/Integrations/VirusTotalV3/VirusTotalV3.py b/Packs/VirusTotal/Integrations/VirusTotalV3/VirusTotalV3.py
index 555903fe1d2a..28f20d953298 100644
--- a/Packs/VirusTotal/Integrations/VirusTotalV3/VirusTotalV3.py
+++ b/Packs/VirusTotal/Integrations/VirusTotalV3/VirusTotalV3.py
@@ -3,7 +3,7 @@
 """
 An integration module for the Virus Total v3 API.
 API Documentation:
-    https://developers.virustotal.com/v3.0/reference
+    https://docs.virustotal.com/reference/overview
 """
 from collections import defaultdict
 from typing import cast
@@ -293,7 +293,7 @@ def __init__(self, params: dict):
     def ip(self, ip: str, relationships: str = '') -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#ip-info
+            https://docs.virustotal.com/reference/ip-info
         """
         return self._http_request(
             'GET',
@@ -303,7 +303,7 @@ def ip(self, ip: str, relationships: str = '') -> dict:
     def file(self, file: str, relationships: str = '') -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#file
+            https://docs.virustotal.com/reference/file
         """
         return self._http_request(
             'GET',
@@ -314,7 +314,7 @@ def file(self, file: str, relationships: str = '') -> dict:
     def private_file(self, file: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/reference/private-files-info
+            https://docs.virustotal.com/reference/private-files-info
         """
         return self._http_request(
             'GET',
@@ -324,7 +324,7 @@ def private_file(self, file: str) -> dict:
     def url(self, url: str, relationships: str = ''):
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#url
+            https://docs.virustotal.com/reference/url
         """
         return self._http_request(
             'GET',
@@ -334,7 +334,7 @@ def url(self, url: str, relationships: str = ''):
     def domain(self, domain: str, relationships: str = '') -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#domain-info
+            https://docs.virustotal.com/reference/domain-info
         """
         return self._http_request(
             'GET',
@@ -347,7 +347,7 @@ def domain(self, domain: str, relationships: str = '') -> dict:
     def delete_comment(self, id_: str):
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#comment-id-delete
+            https://docs.virustotal.com/reference/comment-id-delete
         """
         self._http_request(
             'DELETE',
@@ -358,7 +358,7 @@ def delete_comment(self, id_: str):
     def get_ip_comments(self, ip: str, limit: int) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#ip-comments-get
+            https://docs.virustotal.com/reference/ip-comments-get
         """
 
         return self._http_request(
@@ -370,7 +370,7 @@ def get_ip_comments(self, ip: str, limit: int) -> dict:
     def get_url_comments(self, url: str, limit: int) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#urls-comments-get
+            https://docs.virustotal.com/reference/urls-comments-get
 
         """
         return self._http_request(
@@ -382,7 +382,7 @@ def get_url_comments(self, url: str, limit: int) -> dict:
     def get_hash_comments(self, file_hash: str, limit: int) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#files-comments-get
+            https://docs.virustotal.com/reference/files-comments-get
         """
         return self._http_request(
             'GET',
@@ -393,7 +393,7 @@ def get_hash_comments(self, file_hash: str, limit: int) -> dict:
     def get_domain_comments(self, domain: str, limit: int) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#domains-comments-get
+            https://docs.virustotal.com/reference/domains-comments-get
         """
         return self._http_request(
             'GET',
@@ -404,7 +404,7 @@ def get_domain_comments(self, domain: str, limit: int) -> dict:
     def get_comment_by_id(self, comment_id: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#get-comment
+            https://docs.virustotal.com/reference/get-comment
         """
         return self._http_request(
             'GET',
@@ -430,28 +430,28 @@ def add_comment(self, suffix: str, comment: str) -> dict:
     def add_comment_to_ip(self, ip: str, comment: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#ip-comments-post
+            https://docs.virustotal.com/reference/ip-comments-post
         """
         return self.add_comment(f'ip_addresses/{ip}/comments', comment)
 
     def add_comment_to_url(self, url: str, comment: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#urls-comments-post
+            https://docs.virustotal.com/reference/urls-comments-post
         """
         return self.add_comment(f'urls/{encode_url_to_base64(url)}/comments', comment)
 
     def add_comment_to_domain(self, domain: str, comment: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#domains-comments-post
+            https://docs.virustotal.com/reference/domains-comments-post
         """
         return self.add_comment(f'domains/{domain}/comments', comment)
 
     def add_comment_to_file(self, resource: str, comment: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#files-comments-post
+            https://docs.virustotal.com/reference/files-comments-post
         """
         return self.add_comment(f'files/{resource}/comments', comment)
 
@@ -461,7 +461,7 @@ def add_comment_to_file(self, resource: str, comment: str) -> dict:
     def file_rescan(self, file_hash: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#files-analyse
+            https://docs.virustotal.com/reference/files-analyse
         """
         return self._http_request(
             'POST',
@@ -471,7 +471,7 @@ def file_rescan(self, file_hash: str) -> dict:
     def file_scan(self, file_path: str, /, upload_url: Optional[str]) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/reference/files-scan
+            https://docs.virustotal.com/reference/files-scan
         """
         response: requests.Response
         with open(file_path, 'rb') as file:
@@ -501,7 +501,7 @@ def file_scan(self, file_path: str, /, upload_url: Optional[str]) -> dict:
     def private_file_scan(self, file_path: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/reference/post_files
+            https://docs.virustotal.com/reference/upload-file-private-scanning
         """
         response: requests.Response
         with open(file_path, 'rb') as file:
@@ -530,7 +530,7 @@ def private_file_scan(self, file_path: str) -> dict:
     def get_upload_url(self) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#files-upload-url
+            https://docs.virustotal.com/reference/files-upload-url
         """
         return self._http_request(
             'GET',
@@ -540,7 +540,7 @@ def get_upload_url(self) -> dict:
     def get_private_upload_url(self) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/reference/private-files-upload-url
+            https://docs.virustotal.com/reference/private-files-upload-url
         """
         return self._http_request(
             'GET',
@@ -550,7 +550,7 @@ def get_private_upload_url(self) -> dict:
     def url_scan(self, url: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#urls
+            https://docs.virustotal.com/reference/scan-url
         """
         return self._http_request(
             'POST',
@@ -563,7 +563,7 @@ def url_scan(self, url: str) -> dict:
     def file_sandbox_report(self, file_hash: dict, limit: int) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#files-relationships
+            https://docs.virustotal.com/reference/files-relationships
         """
         return self._http_request(
             'GET',
@@ -575,7 +575,7 @@ def file_sandbox_report(self, file_hash: dict, limit: int) -> dict:
     def passive_dns_data(self, id: dict, limit: int) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#ip-relationships
+            https://docs.virustotal.com/reference/ip-relationships
         """
         return self._http_request(
             'GET',
@@ -586,7 +586,7 @@ def passive_dns_data(self, id: dict, limit: int) -> dict:
     def search(self, query: str, limit: int) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#search-1
+            https://docs.virustotal.com/reference/api-search
         """
         return self._http_request(
             'GET',
@@ -597,7 +597,7 @@ def search(self, query: str, limit: int) -> dict:
     def get_analysis(self, analysis_id: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/v3.0/reference#analysis
+            https://docs.virustotal.com/reference/analysis
         """
         return self._http_request(
             'GET',
@@ -607,7 +607,7 @@ def get_analysis(self, analysis_id: str) -> dict:
     def get_private_analysis(self, analysis_id: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/reference/private-analysis
+            https://docs.virustotal.com/reference/private-analysis
         """
         return self._http_request(
             'GET',
@@ -617,7 +617,7 @@ def get_private_analysis(self, analysis_id: str) -> dict:
     def get_private_file_from_analysis(self, analysis_id: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/reference/item-1
+            https://docs.virustotal.com/reference/private-analyses-object-item
         """
         return self._http_request(
             'GET',
@@ -627,7 +627,7 @@ def get_private_file_from_analysis(self, analysis_id: str) -> dict:
     def get_file_sigma_analysis(self, file_hash: str) -> dict:
         """
         See Also:
-            https://developers.virustotal.com/reference/files#relationships
+            https://docs.virustotal.com/reference/files#relationships
         """
         return self._http_request(
             'GET',
@@ -642,9 +642,9 @@ def get_relationship(self, indicator: str, indicator_type: str, relationship: st
             indicator_type: urls or domains
             relationship: a relationship to search for
         See Also:
-            https://developers.virustotal.com/v3.0/reference#urls-relationships
-            https://developers.virustotal.com/v3.0/reference#domains-relationships
-            https://developers.virustotal.com/v3.0/reference#ip-relationships
+            https://docs.virustotal.com/reference/urls-relationships
+            https://docs.virustotal.com/reference/domains-relationships
+            https://docs.virustotal.com/reference/ip-relationships
         """
         return self._http_request(
             'GET',
@@ -656,7 +656,7 @@ def get_domain_relationships(self, domain: str, relationship: str) -> dict:
         Wrapper of get_relationship
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#domains-relationships
+                https://docs.virustotal.com/reference/domains-relationships
         """
         return self.get_relationship(domain, 'domains', relationship)
 
@@ -665,7 +665,7 @@ def get_domain_communicating_files(self, domain: str) -> dict:
         Wrapper of get_domain_relationships
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#domains-relationships
+            https://docs.virustotal.com/reference/domains-relationships
         """
         return self.get_domain_relationships(
             domain,
@@ -677,7 +677,7 @@ def get_domain_downloaded_files(self, domain: str) -> dict:
         Wrapper of get_domain_relationships
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#domains-relationships
+            https://docs.virustotal.com/reference/domains-relationships
         """
         return self.get_domain_relationships(
             domain,
@@ -689,7 +689,7 @@ def get_domain_referrer_files(self, domain: str) -> dict:
         Wrapper of get_domain_relationships
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#domains-relationships
+                https://docs.virustotal.com/reference/domains-relationships
         """
         return self.get_domain_relationships(
             domain,
@@ -701,7 +701,7 @@ def get_url_relationships(self, url: str, relationship: str) -> dict:
         Wrapper of get_relationship
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#urls-relationships
+                https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_relationship(encode_url_to_base64(url), 'urls', relationship)
 
@@ -710,7 +710,7 @@ def get_url_communicating_files(self, url: str) -> dict:
         Wrapper of url_relationships
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#urls-relationships
+                https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_url_relationships(
             url,
@@ -722,7 +722,7 @@ def get_url_downloaded_files(self, url: str) -> dict:
         Wrapper of url_relationships
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#urls-relationships
+                https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_url_relationships(
             url,
@@ -734,7 +734,7 @@ def get_url_referrer_files(self, url: str) -> dict:
         Wrapper of url_relationships
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#urls-relationships
+                https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_url_relationships(
             url,
@@ -746,7 +746,7 @@ def get_ip_relationships(self, ip: str, relationship: str) -> dict:
         Wrapper of get_relationship
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#urls-relationships
+                https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_relationship(ip, 'ip_addresses', relationship)
 
@@ -755,7 +755,7 @@ def get_ip_communicating_files(self, ip: str) -> dict:
         Wrapper of get_ip_relationships
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#urls-relationships
+            https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_ip_relationships(
             ip,
@@ -767,7 +767,7 @@ def get_ip_downloaded_files(self, ip: str) -> dict:
         Wrapper of get_ip_relationships
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#urls-relationships
+            https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_ip_relationships(
             ip,
@@ -779,7 +779,7 @@ def get_ip_referrer_files(self, ip: str) -> dict:
         Wrapper of get_ip_relationships
 
         See Also:
-                https://developers.virustotal.com/v3.0/reference#urls-relationships
+                https://docs.virustotal.com/reference/urls-relationships
         """
         return self.get_ip_relationships(
             ip,
diff --git a/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/README.md b/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/README.md
index 0d38f9d8c012..bb1dffe79c1a 100644
--- a/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/README.md
+++ b/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/README.md
@@ -1,5 +1,5 @@
 Use the premium API capabilities of VirusTotal to analyze retro hunts, read live hunt notifications, and download files from VirusTotal.
-The differences between VirusTotal's Public API and Premium API can be found [in the VirusTotal v3 API documentation](https://developers.virustotal.com/v3.0/reference#public-vs-premium-api).
+The differences between VirusTotal's Public API and Premium API can be found [in the VirusTotal v3 API documentation](https://docs.virustotal.com/reference/public-vs-premium-api).
 
 This integration was integrated and tested with VirusTotal - Premium (API v3)
 
@@ -306,7 +306,7 @@ Search for files.
 | --- | --- | --- |
 | query | Search query. | Required | 
 | limit | Maximum number of results. Default is 10. | Optional | 
-| order | The order value can be sorted depends on the query type. See documentation. https://developers.virustotal.com/v3.0/reference#intelligence-search. | Optional | 
+| order | The order value can be sorted depends on the query type. See documentation. https://docs.virustotal.com/reference/intelligence-search. | Optional | 
 | cursor | Continuation cursor. | Optional | 
 | descriptors_only | Whether to return full object information or just object descriptors. Possible values are: true, false. Default is false. | Optional | 
 | extended_data | Whether to return full data information. Possible values are: true, false. Default is false. | Optional | 
diff --git a/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.py b/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.py
index 4bfd25be78e9..6ae14cba1241 100644
--- a/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.py
+++ b/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.py
@@ -1,6 +1,6 @@
 """
 VirusTotal V3 - Premium API
-Difference: https://developers.virustotal.com/v3.0/reference#public-vs-premium-api
+Difference: https://docs.virustotal.com/reference/public-vs-premium-api
 """
 import copy
 from collections.abc import Iterable
@@ -224,7 +224,7 @@ def download_file(self, file: str) -> requests.Response:
         """Download a file.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#files-download
+            https://docs.virustotal.com/reference/files-download
         """
         return self._http_request(
             'GET',
@@ -237,7 +237,7 @@ def create_zip(self, hashes: list, password: Optional[str] = None) -> dict:
         """Creates a password-protected ZIP file containing files from VirusTotal.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#zip_files
+            https://docs.virustotal.com/reference/zip_files
         """
         body: dict = {
             'hashes': hashes
@@ -254,7 +254,7 @@ def get_zip(self, zip_id: str) -> dict:
         """Retrieve information about a ZIP file
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#get-zip-file
+            https://docs.virustotal.com/reference/get-zip-file
         """
         return self._http_request(
             'GET',
@@ -265,7 +265,7 @@ def download_zip(self, zip_id: str) -> requests.Response:
         """Download a ZIP file.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#zip-files-download
+            https://docs.virustotal.com/reference/zip-files-download
         """
         return self._http_request(
             'GET',
@@ -278,7 +278,7 @@ def get_pcap_beaviour(self, report_id) -> dict:
         """Extracted PCAP from a sandbox analysis.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#file_behaviours_pcap
+            https://docs.virustotal.com/reference/file_behaviours_pcap
         """
         return self._http_request(
             'GET',
@@ -297,7 +297,7 @@ def search_intelligence(
         """Search for files.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#intelligence-search
+            https://docs.virustotal.com/reference/intelligence-search
         """
         return self._http_request(
             'GET',
@@ -315,7 +315,7 @@ def get_livehunt_rule_by_id(self, id_: str):
         """Retrieve a VT Hunting Livehunt ruleset.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#get-hunting-ruleset.
+            https://docs.virustotal.com/reference/get-hunting-ruleset
         """
         return self._http_request(
             'GET',
@@ -334,7 +334,7 @@ def list_livehunt_rules(
         """Retrieve a VT Hunting Livehunt rulesets.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#list-hunting-rulesets
+            https://docs.virustotal.com/reference/list-hunting-rulesets
         """
         filter_ = ''
         if name:
@@ -363,7 +363,7 @@ def create_livehunt_rule(
     ) -> dict:
         """Create a new VT Hunting Livehunt ruleset.
         See Also:
-            https://developers.virustotal.com/v3.0/reference#create-hunting-ruleset
+            https://docs.virustotal.com/reference/create-hunting-ruleset
         """
         return self._http_request(
             'POST',
@@ -393,7 +393,7 @@ def update_livehunt_rule(
         """Update a VT Hunting Livehunt ruleset.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#create-hunting-ruleset
+            https://docs.virustotal.com/reference/create-hunting-ruleset
         """
         params = assign_params(
             enabled=enabled,
@@ -418,7 +418,7 @@ def delete_livehunt_rule(self, id_: str):
         """Delete a VT Hunting Livehunt ruleset.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#delete-hunting-ruleset
+            https://docs.virustotal.com/reference/delete-hunting-ruleset
         """
         self._http_request(
             'DELETE',
@@ -437,7 +437,7 @@ def list_notifications(
         """Retrieve VT Hunting Livehunt notifications.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#list-hunting-notifications
+            https://docs.virustotal.com/reference/list-hunting-notifications
         """
         time_format = "%Y-%m-%dT%H:%M:%S"
         filter_ = ''
@@ -462,7 +462,7 @@ def list_notifications_files(self, filter_: Optional[str], cursor: Optional[str]
         """Retrieve file objects for VT Hunting Livehunt notifications.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#hunting_notification_files
+            https://docs.virustotal.com/reference/hunting_notification_files
         """
         return self._http_request(
             'GET',
@@ -478,7 +478,7 @@ def list_files_by_rule(self, id_: str, cursor: Optional[str] = None, limit: Opti
         """Get a VT Hunting Livehunt ruleset by hunting notification files relationship.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#get-hunting-ruleset-relationship
+            https://docs.virustotal.com/reference/get-hunting-ruleset-relationship
         """
         return self._http_request(
             'GET',
@@ -498,7 +498,7 @@ def list_retrohunt_jobs(
         """Retrieve retrohunt jobs.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#get-retrohunt-jobs
+            https://docs.virustotal.com/reference/get-retrohunt-jobs
         """
         return self._http_request(
             'GET',
@@ -520,7 +520,7 @@ def create_retrohunt_job(
         """Create a new retrohunt job.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#create-retrohunt-job
+            https://docs.virustotal.com/reference/create-retrohunt-job
         """
         return self._http_request(
             'POST',
@@ -542,7 +542,7 @@ def get_retrohunt_job_by_id(self, id_: str) -> dict:
         """Retrieve a retrohunt job.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#get-retrohunt-job
+            https://docs.virustotal.com/reference/get-retrohunt-job
         """
         return self._http_request(
             'GET',
@@ -553,7 +553,7 @@ def get_retrohunt_job_matching_files(self, id_: str) -> dict:
         """Retrieve matches for a retrohunt job matching file relationship..
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#get-retrohunt-jobs-relationships
+            https://docs.virustotal.com/reference/get-retrohunt-job-relationships
         """
         return self._http_request(
             'GET',
@@ -564,7 +564,7 @@ def get_quota_limits(self, id_: str) -> dict:
         """Retrieve user's API usage.
 
         See Also:
-            https://developers.virustotal.com/v3.0/reference#user-api-usage
+            https://docs.virustotal.com/reference/user-api-usage
         """
         return self._http_request(
             'GET',
diff --git a/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.yml b/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.yml
index 8bec3d2eff36..4f0098b07af0 100644
--- a/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.yml
+++ b/Packs/VirusTotal/Integrations/VirusTotal_V3_Premium/VirusTotal_V3_Premium.yml
@@ -230,7 +230,7 @@ script:
     - description: Maximum number of results.
       defaultValue: '10'
       name: limit
-    - description: The order value can be sorted depends on the query type. See documentation. https://developers.virustotal.com/v3.0/reference#intelligence-search
+    - description: The order value can be sorted depends on the query type. See documentation. https://docs.virustotal.com/reference/intelligence-search
       name: order
     - description: Continuation cursor.
       name: cursor
diff --git a/Packs/VirusTotal/Playbooks/Detonate_Private_File_-_VirusTotal_V3_README.md b/Packs/VirusTotal/Playbooks/Detonate_Private_File_-_VirusTotal_V3_README.md
index ee06367b12c8..dd1a7b3398ed 100644
--- a/Packs/VirusTotal/Playbooks/Detonate_Private_File_-_VirusTotal_V3_README.md
+++ b/Packs/VirusTotal/Playbooks/Detonate_Private_File_-_VirusTotal_V3_README.md
@@ -2,7 +2,7 @@ Detonate a private file through VirusTotal Private Scanning service
 
 See files through the eyes of VirusTotal without uploading them to the main threat corpus, keeping them entirely private. Static, dynamic, network and similarity analysis included, as well as automated threat intel enrichment, but NOT multi-antivirus analysis.
 
-More information: https://support.virustotal.com/hc/en-us/articles/8516907790749-Private-Scanning
+More information: https://docs.virustotal.com/docs/private-scanning
 
 Get Private Scanning: https://www.virustotal.com/gui/contact-us
 
diff --git a/Packs/VirusTotal/README.md b/Packs/VirusTotal/README.md
index 9ff32871d47d..0cd82f7e2484 100644
--- a/Packs/VirusTotal/README.md
+++ b/Packs/VirusTotal/README.md
@@ -37,8 +37,8 @@ Security team challenges | Solving with VirusTotal + XSOAR
 - Is a vulnerability (CVE) that appeared in my environment being currently leveraged by malware? How popular is it?
 
 **Technical capabilities**
-- Threat reputation for {files, hashes, domains, IPs, URLs} coming from [over 90 security vendors](https://support.virustotal.com/hc/en-us/articles/115002146809-Contributors) (antivirus solutions, nextgen EDRs, domain blocklists, network perimeter solutions, etc.).
-- Multi-angular detection for files via crowdsourced {[YARA](https://virustotal.github.io/yara/), [SIGMA](https://blog.virustotal.com/2021/05/context-is-king-part-i-crowdsourced.html), [IDS](https://support.virustotal.com/hc/en-us/articles/360018436078-Crowdsourced-IDS-Rules)} rules.
+- Threat reputation for {files, hashes, domains, IPs, URLs} coming from [over 90 security vendors](https://docs.virustotal.com/docs/contributors) (antivirus solutions, nextgen EDRs, domain blocklists, network perimeter solutions, etc.).
+- Multi-angular detection for files via crowdsourced {[YARA](https://virustotal.github.io/yara/), [SIGMA](https://blog.virustotal.com/2021/05/context-is-king-part-i-crowdsourced.html), [IDS](https://docs.virustotal.com/docs/crowdsourced-ids-rules)} rules.
 - Allowlist (benign) information through the [aggregation of goodware indicators and provenance details](https://blog.virustotal.com/2021/08/introducing-known-distributors.html).
 - Dynamic analysis for files through detonation in [multiple home-grown and 3rd-party partner](https://blog.virustotal.com/search/label/multisandbox) sandbox solutions.
 - Extended file context and metadata through static analysis tools such as sigcheck’s authenticode signature extractor, MS Office macro VBA dissectors, Didier Stevens’ PDF tools, etc.
@@ -71,7 +71,7 @@ Security team challenges | Solving with VirusTotal + XSOAR
 **Additional information**
 - [Contact the VirusTotal team](https://www.virustotal.com/gui/contact-us)
 - [VirusTotal public website](https://www.virustotal.com/)
-- [VirusTotal API developer reference guide](https://developers.virustotal.com/v3.0/reference)
+- [VirusTotal API developer reference guide](https://docs.virustotal.com/reference/overview)
 - [VirusTotal 360 overview brief](https://www.virustotal.com/go/vt360)
 - [VirusTotal service catalog](http://www.virustotal.com/go/vt-services-catalog)
 - [VirusTotal webinars](https://www.brighttalk.com/search/?q=%22Google+Cloud+Security%22+%22VirusTotal%22)
diff --git a/Packs/VirusTotal/ReleaseNotes/2_6_23.md b/Packs/VirusTotal/ReleaseNotes/2_6_23.md
new file mode 100644
index 000000000000..cedf2cb363f6
--- /dev/null
+++ b/Packs/VirusTotal/ReleaseNotes/2_6_23.md
@@ -0,0 +1,8 @@
+
+#### Integrations
+
+##### VirusTotal (API v3)
+Updated the documentation and metadata with up-to-date api-references.
+  
+##### VirusTotal - Premium (API v3)
+Updated the documentation and metadata with up-to-date api-references.
diff --git a/Packs/VirusTotal/TestPlaybooks/playbook-VirusTotal_preferred_vendors_test.yml b/Packs/VirusTotal/TestPlaybooks/playbook-VirusTotal_preferred_vendors_test.yml
index 2fd9b96f5662..d3ff0bbfd2c6 100644
--- a/Packs/VirusTotal/TestPlaybooks/playbook-VirusTotal_preferred_vendors_test.yml
+++ b/Packs/VirusTotal/TestPlaybooks/playbook-VirusTotal_preferred_vendors_test.yml
@@ -8,7 +8,7 @@ description: |
 
   Sleep for 60 seconds.
 
-  https://support.virustotal.com/hc/en-us/articles/115002118525-The-4-requests-minute-limitation-of-the-Public-API-is-too-low-for-me-how-can-I-have-access-to-a-higher-quota-
+  https://docs.virustotal.com/reference/public-vs-premium-api
 starttaskid: "0"
 tasks:
   "0":
diff --git a/Packs/VirusTotal/TestPlaybooks/playbook-virusTotal-test.yml b/Packs/VirusTotal/TestPlaybooks/playbook-virusTotal-test.yml
index 1432b94ce213..ff6efae15736 100644
--- a/Packs/VirusTotal/TestPlaybooks/playbook-virusTotal-test.yml
+++ b/Packs/VirusTotal/TestPlaybooks/playbook-virusTotal-test.yml
@@ -8,7 +8,7 @@ description: |
 
   Sleep for 60 seconds.
 
-  https://support.virustotal.com/hc/en-us/articles/115002118525-The-4-requests-minute-limitation-of-the-Public-API-is-too-low-for-me-how-can-I-have-access-to-a-higher-quota-
+  https://docs.virustotal.com/reference/public-vs-premium-api
 starttaskid: "0"
 tasks:
   "0":
diff --git a/Packs/VirusTotal/pack_metadata.json b/Packs/VirusTotal/pack_metadata.json
index 7989872de266..4f429be6e042 100644
--- a/Packs/VirusTotal/pack_metadata.json
+++ b/Packs/VirusTotal/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "VirusTotal",
     "description": "Analyze suspicious hashes, URLs, domains and IP addresses",
     "support": "partner",
-    "currentVersion": "2.6.22",
+    "currentVersion": "2.6.23",
     "author": "VirusTotal",
     "url": "https://www.virustotal.com",
     "email": "contact@virustotal.com",
diff --git a/Packs/Zscaler/Integrations/Zscaler/Zscaler.py b/Packs/Zscaler/Integrations/Zscaler/Zscaler.py
index c4caadb04035..5a877004936a 100644
--- a/Packs/Zscaler/Integrations/Zscaler/Zscaler.py
+++ b/Packs/Zscaler/Integrations/Zscaler/Zscaler.py
@@ -190,7 +190,7 @@ def blacklist_url(url):
     cmd_url = "/security/advanced/blacklistUrls?action=ADD_TO_LIST"
     data = {"blacklistUrls": urls_to_blacklist}
     json_data = json.dumps(data)
-    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS)
+    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS, resp_type='response')
     list_of_urls = ""
     for url in urls_to_blacklist:
         list_of_urls += "- " + url + "\n"
@@ -213,7 +213,7 @@ def unblacklist_url(url):
 
     data = {"blacklistUrls": urls_to_unblacklist}
     json_data = json.dumps(data)
-    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS)
+    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS, resp_type='response')
     list_of_urls = ""
     for url in urls_to_unblacklist:
         list_of_urls += "- " + url + "\n"
@@ -227,7 +227,7 @@ def blacklist_ip(ip):
     cmd_url = "/security/advanced/blacklistUrls?action=ADD_TO_LIST"
     data = {"blacklistUrls": ips_to_blacklist}
     json_data = json.dumps(data)
-    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS)
+    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS, resp_type='response')
     list_of_ips = ""
     for ip in ips_to_blacklist:
         list_of_ips += "- " + ip + "\n"
@@ -251,7 +251,7 @@ def unblacklist_ip(ip):
         raise Exception("Given IP addresses are not blacklisted.")
     data = {"blacklistUrls": ips_to_unblacklist}
     json_data = json.dumps(data)
-    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS)
+    http_request("POST", cmd_url, json_data, DEFAULT_HEADERS, resp_type='response')
     list_of_ips = ""
     for ip in ips_to_unblacklist:
         list_of_ips += "- " + ip + "\n"
diff --git a/Packs/Zscaler/Integrations/Zscaler/Zscaler.yml b/Packs/Zscaler/Integrations/Zscaler/Zscaler.yml
index 3bf68229e01d..93b56d31d407 100644
--- a/Packs/Zscaler/Integrations/Zscaler/Zscaler.yml
+++ b/Packs/Zscaler/Integrations/Zscaler/Zscaler.yml
@@ -1935,7 +1935,7 @@ script:
     description: Deletes the IP destination groups for the specified group ID.
   script: ''
   subtype: python3
-  dockerimage: demisto/python3:3.10.14.92207
+  dockerimage: demisto/python3:3.11.9.105369
   type: python
 fromversion: 5.0.0
 tests:
diff --git a/Packs/Zscaler/ReleaseNotes/1_3_23.md b/Packs/Zscaler/ReleaseNotes/1_3_23.md
new file mode 100644
index 000000000000..39e83413563b
--- /dev/null
+++ b/Packs/Zscaler/ReleaseNotes/1_3_23.md
@@ -0,0 +1,11 @@
+
+#### Integrations
+
+##### Zscaler Internet Access
+
+- Fixed an issue where the following commands did not send the request properly:
+  - *zscaler-blacklist-url*
+  - *zscaler-blacklist-ip*
+  - *zscaler-undo-blacklist-url*
+  - *zscaler-undo-blacklist-ip*
+- Updated the Docker image to: *demisto/python3:3.11.9.105369*.
diff --git a/Packs/Zscaler/pack_metadata.json b/Packs/Zscaler/pack_metadata.json
index dd47bb4b7dc0..69b6a68c42b1 100644
--- a/Packs/Zscaler/pack_metadata.json
+++ b/Packs/Zscaler/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Zscaler Internet Access",
     "description": "Zscaler is a cloud security solution built for performance and flexible scalability.",
     "support": "xsoar",
-    "currentVersion": "1.3.22",
+    "currentVersion": "1.3.23",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",
diff --git a/Packs/rasterize/Integrations/rasterize/README.md b/Packs/rasterize/Integrations/rasterize/README.md
index eb33838f00ec..becb34f840ca 100644
--- a/Packs/rasterize/Integrations/rasterize/README.md
+++ b/Packs/rasterize/Integrations/rasterize/README.md
@@ -29,6 +29,7 @@ If you are using the integration to rasterize un-trusted URLs or HTML content, s
     ```
 
     To set a language for the browser, add the *--accept-lang* argument followed by the desired language code in IETF BCP 47 format. For example, `--accept-lang=de-DE`.
+If you want to set the language to en-US, use en-GB instead.
 * Rasterize Mode: It is possible to rasterize either via Chrome WebDriver or Chrome Headless CLI. WebDriver supports more options than Headless CLI. Such as support for the `offline` option in the `rasterize-emails` command. There are some urls that do not rasterize well with WebDriver and may succeed with Headless CLI. Thus, it is recommended to use the `WebDriver - Preferred` mode, which will use WebDriver as a start and fallback to Headless CLI if it fails.
 * Use system proxy settings: Select this checkbox to use the system's proxy settings. **Important**: this integration does not support proxies which require authentication.
 
diff --git a/Packs/rasterize/Integrations/rasterize/rasterize_description.md b/Packs/rasterize/Integrations/rasterize/rasterize_description.md
index 45e19670fe13..7dd252c7ca51 100644
--- a/Packs/rasterize/Integrations/rasterize/rasterize_description.md
+++ b/Packs/rasterize/Integrations/rasterize/rasterize_description.md
@@ -12,5 +12,6 @@ If you are using the integration to rasterize un-trusted URLs or HTML content, s
     --disable-auto-reload,[--disable-dev-shm-usage]
     ```
     To set a language for the browser, add the *--accept-lang* argument followed by the desired language code in IETF BCP 47 format. For example, `--accept-lang=de-DE`.
+    If you want to set the language to en-US, use en-GB instead.
 * Rasterize Mode: It is possible to rasterize either via Chrome WebDriver or Chrome Headless CLI. WebDriver supports more options than Headless CLI. Such as support for the `offline` option in the `rasterize-emails` command. There are some urls that do not rasterize well with WebDriver and may succeed with Headless CLI. Thus, it is recommended to use the `WebDriver - Preferred` mode, which will use WebDriver as a start and fallback to Headless CLI if it fails.
 * Use system proxy settings: Select this checkbox to use the system's proxy settings. **Important**: this integration does not support proxies which require authentication.
diff --git a/Packs/rasterize/ReleaseNotes/2_0_19.md b/Packs/rasterize/ReleaseNotes/2_0_19.md
new file mode 100644
index 000000000000..91e23f6d4f43
--- /dev/null
+++ b/Packs/rasterize/ReleaseNotes/2_0_19.md
@@ -0,0 +1,4 @@
+#### Integrations
+
+##### Rasterize
+Updated integration description.
\ No newline at end of file
diff --git a/Packs/rasterize/pack_metadata.json b/Packs/rasterize/pack_metadata.json
index 871de71e22e1..32421e04dc81 100644
--- a/Packs/rasterize/pack_metadata.json
+++ b/Packs/rasterize/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Rasterize",
     "description": "Converts URLs, PDF files, and emails to an image file or PDF file.",
     "support": "xsoar",
-    "currentVersion": "2.0.18",
+    "currentVersion": "2.0.19",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",