diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/RELEASE.md b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/RELEASE.md
index 47abd16572..ca7d720c44 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/RELEASE.md
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/RELEASE.md
@@ -7,22 +7,25 @@ New Drivers
 * [CAN FD 1.0](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__canfd.html)
 
 Updated Drivers
+* [DMAC 1.10](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__dmac.html)
+* [SD Host 1.30](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__sd_host.html)
+* [SMIF 1.40](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__smif.html)
+* [Startup 2.60](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__system__config.html)
+* [SysPm 4.30](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__syspm.html)
+* [USBFS 2.10](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__usbfs__dev__drv.html)
+
+Drivers with patch version updates
 * [Crypto 2.30.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__crypto.html)
 * [CTB 1.10.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__ctb.html)
-* [DMAC 1.10](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__dmac.html)
 * [eFuse 1.10.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__efuse.html)
 * [Flash 3.30.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__flash.html)
 * [PDM_PCM 2.20.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__pdm_pcm.html)
 * [RTC 2.20.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__rtc.html)
 * [SAR 1.20.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__sar.html)
 * [SCB 2.30.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__scb.html)
-* [SD Host 1.30](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__sd_host.html)
-* [SMIF 1.40](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__smif.html)
 * [SysClk 1.40.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__sysclk.html)
 * [SysLib 2.40.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__syslib.html)
-* [SysPm 4.30](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__syspm.html)
 * [TCPWM 1.10.1](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__tcpwm.html)
-* [USBFS 2.10](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__usbfs__dev__drv.html)
 
 ### Known Issues
 None
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_usbfs_dev_drv.h b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_usbfs_dev_drv.h
index 58626d9076..840a07a75d 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_usbfs_dev_drv.h
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_usbfs_dev_drv.h
@@ -184,6 +184,13 @@
 * Refer to \ref group_sysclk driver API for more detail about clock 
 * configuration.
 *
+* The FLL (Clock Path 0) with ECO also can be used as an alternative USB source
+* with the next configuration settings, for 48 MHz:
+* \snippet usbfs/snippet/main.c snipped_Cy_USBFS_Dev_Drv_fllConfig48MHz
+* And for 96 MHz:
+* \snippet usbfs/snippet/main.c snipped_Cy_USBFS_Dev_Drv_fllConfig96MHz
+* Use these structures with \ref Cy_SysClk_FllManualConfigure
+*
 ********************************************************************************
 * \subsection group_usbfs_dev_drv_dma Assign and Route DMA Channels
 ********************************************************************************
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_bt-1.0.cypersonality b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_bt-1.0.cypersonality
index f989d62f84..d42274de54 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_bt-1.0.cypersonality
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_bt-1.0.cypersonality
@@ -41,7 +41,7 @@
     <ParamBool id="btHostWake" name="Enable" group="BT Wake-Up Configurations" default="false" visible="true" editable="true" desc="Enable/disable the host wake configuration. If disabled, host wake configuration defined by BSP will be used." />
 
     <!-- Host wake settings -->
-    <ParamBlock id="hostWakePin" blockType="ioss\.port\.pin" name="Host-Wake-Up Signal" group="Host-Wake-Up Configuration" canBeEmpty="true" visible="`${btHostWake}`" desc="Select the host IRQ signal connected to BT_HOST_WAKE signal." />
+    <ParamBlock id="hostWakePin" blockType="ioss\.port\.pin" name="Host-Wake-Up Signal" group="Host-Wake-Up Configuration" canBeEmpty="true" visible="`${btHostWake}`" desc="Select the host IRQ signal connected to BT_HOST_WAKE signal. The pin must be enabled on the Pins tab to be added as an option to the pull-down menu. If left empty, the pin will be unconfigured." />
     <ParamBool id="hostWakeConnected" name="hostWakeConnected" group="Internal" default="`${hostWakePin ne &quot;&quot; &amp;&amp; btHostWake}`" visible="false" editable="false" desc="True, if HOST_WAKE is connected" />
     <ParamChoice id="hostWakeIrqEvent" name="Host-Wake-Up IRQ Event" group="Host-Wake-Up Configuration" default="CYCFG_BT_WAKE_EVENT_ACTIVE_LOW" visible="`${hostWakeConnected}`" editable="true" desc="Select the trigger condition for the BT_HOST_WAKE signal.">
       <Entry name="Falling Edge" value="CYCFG_BT_WAKE_EVENT_ACTIVE_LOW" visible="true" />
@@ -49,7 +49,7 @@
     </ParamChoice>
 
     <!-- Device wake settings -->
-    <ParamBlock id="devWakePin" blockType="ioss\.port\.pin" name="Device-Wake-Up Signal" group="Device-Wake-Up Configuration" canBeEmpty="true" visible="`${btHostWake}`" desc="Select the host pin connected to the BT_DEV_WAKE signal." />
+    <ParamBlock id="devWakePin" blockType="ioss\.port\.pin" name="Device-Wake-Up Signal" group="Device-Wake-Up Configuration" canBeEmpty="true" visible="`${btHostWake}`" desc="Select the host pin connected to the BT_DEV_WAKE signal. The pin must be enabled on the Pins tab to be added as an option to the pull-down menu. If left empty, the pin will be unconfigured." />
     <ParamBool id="devWakeConnected" name="devWakeConnected" group="Internal" default="`${devWakePin ne &quot;&quot; &amp;&amp; btHostWake}`" visible="false" editable="false" desc="True, if DEV_WAKE is connected." />
     <ParamChoice id="devWakePolarity" name="Device-Wake-Up Polarity" group="Device-Wake-Up Configuration" default="CYCFG_BT_WAKE_EVENT_ACTIVE_LOW" visible="`${devWakeConnected}`" editable="true" desc="Select the polarity for the BT_DEV_WAKE signal.">
       <Entry name="Active Low" value="CYCFG_BT_WAKE_EVENT_ACTIVE_LOW" visible="true" />
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_wifi-1.0.cypersonality b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_wifi-1.0.cypersonality
index 6e5c6b946a..fd92874cd5 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_wifi-1.0.cypersonality
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_wifi-1.0.cypersonality
@@ -39,7 +39,7 @@
 
     <!-- Host wake settings -->
     <ParamBool id="hostWake" name="Enable" group="Host Wake Configuration" default="true" visible="true" editable="true" desc="Enable host wake configuration." />
-    <ParamBlock id="hostIRQ" blockType="ioss\.port\.pin" name="Host Device Interrupt Pin" group="Host Wake Configuration" canBeEmpty="true" visible="`${hostWake}`" desc="Select the host pin which is connected to WiFi device's WL_HOST_WAKE signal. If left empty, the HOST_WAKE pin will be unconfigured." >
+    <ParamBlock id="hostIRQ" blockType="ioss\.port\.pin" name="Host Device Interrupt Pin" group="Host Wake Configuration" canBeEmpty="true" visible="`${hostWake}`" desc="Select the host pin which is connected to WiFi device's WL_HOST_WAKE signal. The pin must be enabled on the Pins tab to be added as an option to the pull-down menu. If left empty, the HOST_WAKE pin will be unconfigured." >
       <Constraint type="ACCEPT" targetLocation="ioss\[\d+\]\.port\[\d+\]\.pin.*" valid="true" >
         <Parameter id="isrTrigger" severity="WARNING" reason="The pin must be configured to generate interrupts on rising or falling edge.">
           <Choice>
@@ -73,7 +73,7 @@
 
     <!-- AWS MQTT Filters -->
     <!-- TLS Configuration -->
-    <ParamBool id="configTLS" name="Enable MQTT TLS Filter" group="AWS MQTT Filters" default="false" visible="true" editable="true" desc="Enable AWS MQTT filter for TLS protocol." />  
+    <ParamBool id="configTLS" name="Enable MQTT TLS Filter" group="AWS MQTT Filters" default="false" visible="true" editable="true" desc="Enable AWS MQTT filter for TLS protocol." />
     <ParamString id="configTLSID" name="Filter ID" group="MQTT TLS Filter Configuration" default="0" visible="`${configTLS}`" editable="false" desc="Filter ID." />
     <ParamChoice id="filterTLSAction" name="Action" group="MQTT TLS Filter Configuration" default="CY_PF_ACTION_KEEP" visible="`${configTLS}`" editable="true" desc="Filter can either pass up packets that match the filter to the host device (Keep) or drop them so the host device never gets them (Discard)." >
       <Entry name="Keep" value="CY_PF_ACTION_KEEP" visible="true" />
@@ -112,59 +112,60 @@
     </ParamChoice>
     <ParamRange id="filterNonTLSPort" name="Port Number" group="MQTT Filter Configuration" default="1883" min="0" max="65535" resolution="1" visible="`${configNonTLS}`" editable="false" desc="Port number for non TLS protocols filter." />
 
-    <Repeat count="20">
-      <ParamBool id="config$idx" name="Enable Filter Configuration $idx" group="Packet Filters" default="false" visible="true" editable="true" desc="Enable packet filter configuration $idx." />
-    </Repeat>
-
-    <ParamString id="config0_id" name="Filter ID" group="Packet Filter Configuration 0" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0)}`" visible="`${config0}`" editable="false" desc="Filter ID." />
-    <ParamString id="config1_id" name="Filter ID" group="Packet Filter Configuration 1" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0)}`" visible="`${config1}`" editable="false" desc="Filter ID." />
-    <ParamString id="config2_id" name="Filter ID" group="Packet Filter Configuration 2" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0)}`" visible="`${config2}`" editable="false" desc="Filter ID." />
-    <ParamString id="config3_id" name="Filter ID" group="Packet Filter Configuration 3" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0)}`" visible="`${config3}`" editable="false" desc="Filter ID." />
-    <ParamString id="config4_id" name="Filter ID" group="Packet Filter Configuration 4" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0)}`" visible="`${config4}`" editable="false" desc="Filter ID." />
-    <ParamString id="config5_id" name="Filter ID" group="Packet Filter Configuration 5" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0)}`" visible="`${config5}`" editable="false" desc="Filter ID." />
-    <ParamString id="config6_id" name="Filter ID" group="Packet Filter Configuration 6" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0)}`" visible="`${config6}`" editable="false" desc="Filter ID." />
-    <ParamString id="config7_id" name="Filter ID" group="Packet Filter Configuration 7" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0)}`" visible="`${config7}`" editable="false" desc="Filter ID." />
-    <ParamString id="config8_id" name="Filter ID" group="Packet Filter Configuration 8" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0)}`" visible="`${config8}`" editable="false" desc="Filter ID." />
-    <ParamString id="config9_id" name="Filter ID" group="Packet Filter Configuration 9" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0)}`" visible="`${config9}`" editable="false" desc="Filter ID." />
-    <ParamString id="config10_id" name="Filter ID" group="Packet Filter Configuration 10" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0)}`" visible="`${config10}`" editable="false" desc="Filter ID." />
-    <ParamString id="config11_id" name="Filter ID" group="Packet Filter Configuration 11" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0)}`" visible="`${config11}`" editable="false" desc="Filter ID." />
-    <ParamString id="config12_id" name="Filter ID" group="Packet Filter Configuration 12" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0)}`" visible="`${config12}`" editable="false" desc="Filter ID." />
-    <ParamString id="config13_id" name="Filter ID" group="Packet Filter Configuration 13" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0)}`" visible="`${config13}`" editable="false" desc="Filter ID." />
-    <ParamString id="config14_id" name="Filter ID" group="Packet Filter Configuration 14" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0) + (config13 ? 1 : 0)}`" visible="`${config14}`" editable="false" desc="Filter ID." />
-    <ParamString id="config15_id" name="Filter ID" group="Packet Filter Configuration 15" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0) + (config13 ? 1 : 0) + (config14 ? 1 : 0)}`" visible="`${config15}`" editable="false" desc="Filter ID." />
-    <ParamString id="config16_id" name="Filter ID" group="Packet Filter Configuration 16" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0) + (config13 ? 1 : 0) + (config14 ? 1 : 0) + (config15 ? 1 : 0)}`" visible="`${config16}`" editable="false" desc="Filter ID." />
-    <ParamString id="config17_id" name="Filter ID" group="Packet Filter Configuration 17" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0) + (config13 ? 1 : 0) + (config14 ? 1 : 0) + (config15 ? 1 : 0) + (config16 ? 1 : 0)}`" visible="`${config17}`" editable="false" desc="Filter ID." />
-    <ParamString id="config18_id" name="Filter ID" group="Packet Filter Configuration 18" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0) + (config13 ? 1 : 0) + (config14 ? 1 : 0) + (config15 ? 1 : 0) + (config16 ? 1 : 0) + (config17 ? 1 : 0)}`" visible="`${config18}`" editable="false" desc="Filter ID." />
-    <ParamString id="config19_id" name="Filter ID" group="Packet Filter Configuration 19" default="`${(configTLS ? 1 : 0) + (configNonTLS ? 1 : 0) + (config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0) + (config13 ? 1 : 0) + (config14 ? 1 : 0) + (config15 ? 1 : 0) + (config16 ? 1 : 0) + (config17 ? 1 : 0) + (config18 ? 1 : 0)}`" visible="`${config19}`" editable="false" desc="Filter ID." />
+    <ParamBool id="minKeepFilt" name="Add Minimal Set of Keep Filters" group="Packet Filters" default="false" visible="true" editable="true" desc="Create a minimal set of keep filters required for the host to join the network. The set allows ARP, 802_1X Security, DHCP, and DNS. Enabling this option will enable and configure packet filter configurations 0-3." />
 
     <!-- Packet Filter Configurations -->
+    <!-- Minimum Set of Keep Filters to be able to connect to the network:
+      - Keep, EtherType 0x806 # Allow ARP
+      - Keep, EtherType 0x888e # Allow 802_1X Security
+      - Keep, Port Filter: UDP, Dest Port 68 # Allow DHCP
+      - Keep, Port Filter: UDP, Source Port 53 # Allow DNS
+    Enable and configure the filters when requested -->
     <Repeat count="20">
-      <ParamChoice id="filter$idx_type" name="Filter Type" group="Packet Filter Configuration $idx" default="CY_PF_PORT_FILTER" visible="`${config$idx}`" editable="true" desc="Choose filter type." >
+      <ParamBool id="config$idx_editable" name="Filter Configuration $idx is Editable" group="Internal" default="`${($idx &gt;= 4) || !minKeepFilt}`" visible="false" editable="false" desc="" />
+      <ParamBool id="config$idx" name="Enable Filter Configuration $idx" group="Packet Filters" default="`${($idx &lt; 4) &amp;&amp; minKeepFilt}`" visible="true" editable="`${config$idx_editable}`" desc="Enable packet filter configuration $idx." />
+      <ParamBool id="config$idx_id" name="Filter ID" group="Packet Filter Configuration $idx" 
+        default="`${$idx == 0 ? ((configTLS ? 1 : 0) + (configNonTLS ? 1 : 0)) : 
+                               (getParamValue(&quot;config&quot; . ($idx-1) . &quot;_id&quot;) + (getParamValue(&quot;config&quot; . ($idx-1)) ? 1 : 0))}`" visible="`${config$idx}`" editable="false" desc="Filter ID." />
+
+      <ParamChoice id="filter$idx_type" name="Filter Type" group="Packet Filter Configuration $idx" 
+        default="`${$idx == 0 || $idx == 1 ? (minKeepFilt ? CY_PF_PORT_ETHER_TYPE_FILTER : CY_PF_PORT_FILTER) :
+                                              CY_PF_PORT_FILTER}`" visible="`${config$idx}`" editable="`${config$idx_editable}`" desc="Choose filter type." >
         <Entry name="Port Filter" value="CY_PF_PORT_FILTER" visible="true" />
         <Entry name="Port Filter Block" value="CY_PF_PORT_BLOCK_FILTER" visible="true" />
         <Entry name="Ether Type" value="CY_PF_PORT_ETHER_TYPE_FILTER" visible="true" />
         <Entry name="IP Type" value="CY_PF_PORT_IP_TYPE_FILTER" visible="true" />
       </ParamChoice>
       <ParamBool id="filter$idx_portnum" name="Filter$idx Portnum" group="Internal" default="`${filter$idx_type eq CY_PF_PORT_FILTER || filter$idx_type eq CY_PF_PORT_BLOCK_FILTER}`" visible="false" editable="false" desc="Filter Port Number." />
-      <ParamChoice id="filter$idx_action" name="Action" group="Packet Filter Configuration $idx" default="CY_PF_ACTION_KEEP" visible="`${config$idx}`" editable="true" desc="The filter can either pass up packets that match the filter to the host device (Keep) or drop them so that the host device never gets them (Discard)." >
+      <ParamChoice id="filter$idx_action" name="Action" group="Packet Filter Configuration $idx" default="`${CY_PF_ACTION_KEEP}`" visible="`${config$idx}`" editable="`${config$idx_editable}`" desc="The filter can either pass up packets that match the filter to the host device (Keep) or drop them so that the host device never gets them (Discard)." >
         <Entry name="Keep" value="CY_PF_ACTION_KEEP" visible="true" />
         <Entry name="Discard" value="CY_PF_ACTION_DISCARD" visible="true" />
       </ParamChoice>
       <ParamChoice id="filter$idx_allow" name="When Active" group="Packet Filter Configuration $idx" default="CY_PF_ACTIVE_SLEEP | CY_PF_ACTIVE_WAKE" visible="`${config$idx}`" editable="false" desc="Defines when the filter is active." >
         <Entry name="Always" value="CY_PF_ACTIVE_SLEEP | CY_PF_ACTIVE_WAKE" visible="true" />
       </ParamChoice>
-      <ParamChoice id="filter$idx_prot" name="Protocol" group="Packet Filter Configuration $idx" default="CY_PF_PROTOCOL_TCP" visible="`${config$idx &amp;&amp; filter$idx_portnum}`" editable="true" desc="Choose the communication protocol." >
+      <ParamChoice id="filter$idx_prot" name="Protocol" group="Packet Filter Configuration $idx"
+        default="`${$idx == 2 || $idx == 3 ? (minKeepFilt ? CY_PF_PROTOCOL_UDP : CY_PF_PROTOCOL_TCP) :
+                                              CY_PF_PROTOCOL_TCP}`" visible="`${config$idx &amp;&amp; filter$idx_portnum}`" editable="`${config$idx_editable}`" desc="Choose the communication protocol." >
         <Entry name="TCP" value="CY_PF_PROTOCOL_TCP" visible="true" />
         <Entry name="UDP" value="CY_PF_PROTOCOL_UDP" visible="true" />
       </ParamChoice>
-      <ParamChoice id="filter$idx_dir" name="Direction" group="Packet Filter Configuration $idx" default="PF_PN_PORT_DEST" visible="`${config$idx &amp;&amp; filter$idx_portnum}`" editable="true" desc="Choose the source or destination port." >
+      <ParamChoice id="filter$idx_dir" name="Direction" group="Packet Filter Configuration $idx" 
+      default="`${$idx == 3 ? (minKeepFilt ? PF_PN_PORT_SOURCE : PF_PN_PORT_DEST) :
+                              PF_PN_PORT_DEST}`" visible="`${config$idx &amp;&amp; filter$idx_portnum}`" editable="`${config$idx_editable}`" desc="Choose the source or destination port." >
         <Entry name="Destination Port" value="PF_PN_PORT_DEST" visible="true" />
         <Entry name="Source Port" value="PF_PN_PORT_SOURCE" visible="true" />
       </ParamChoice>
-      <ParamRange id="filter$idx_ether_type" name="EtherType" group="Packet Filter Configuration $idx" default="2048" min="2048" max="65535" resolution="1" visible="`${config$idx &amp;&amp; (filter$idx_type eq CY_PF_PORT_ETHER_TYPE_FILTER)}`" editable="true" desc="Enter a 16-bit ether type value. Example: 2048 (0x800) for IP, 2054 (0x806) for ARP." />
-      <ParamRange id="filter$idx_ip_type" name="IP Protocol" group="Packet Filter Configuration $idx" default="0" min="0" max="255" resolution="1" visible="`${config$idx &amp;&amp; (filter$idx_type eq CY_PF_PORT_IP_TYPE_FILTER)}`" editable="true" desc="Enter the desired IP protocol number." />
-      <ParamRange id="filter$idx_port" name="Port Number" group="Packet Filter Configuration $idx" default="1024" min="0" max="65535" resolution="1" visible="`${config$idx &amp;&amp; filter$idx_portnum}`" editable="true" desc="Either the single port to be filtered or the beginning of the block of contiguous numbers. When using a block, the starting port must be power of 2." />
-      <ParamRange id="filter$idx_end_port" name="Range" group="Packet Filter Configuration $idx" default="1023" min="0" max="65535" resolution="1" visible="`${config$idx &amp;&amp; (filter$idx_type eq CY_PF_PORT_BLOCK_FILTER)}`" editable="true" desc="Indicates the size of the block of port numbers, must be of the (2^y - 1) form and less than Port Number." />
+      <ParamRange id="filter$idx_ether_type" name="EtherType" group="Packet Filter Configuration $idx" min="2048" max="65535" resolution="1" 
+        default="`${$idx == 0 ? (minKeepFilt ? 0x0806 : 0x800) :
+                    $idx == 1 ? (minKeepFilt ? 0x888e : 0x800) :
+                                0x800}`" visible="`${config$idx &amp;&amp; (filter$idx_type eq CY_PF_PORT_ETHER_TYPE_FILTER)}`" editable="`${config$idx_editable}`" desc="Enter a 16-bit ether type value. Example: 0x800 for IP, 0x806 for ARP." />
+      <ParamRange id="filter$idx_ip_type" name="IP Protocol" group="Packet Filter Configuration $idx" default="0" min="0" max="255" resolution="1" visible="`${config$idx &amp;&amp; (filter$idx_type eq CY_PF_PORT_IP_TYPE_FILTER)}`" editable="`${config$idx_editable}`" desc="Enter the desired IP protocol number." />
+      <ParamRange id="filter$idx_port" name="Port Number" group="Packet Filter Configuration $idx" min="0" max="65535" resolution="1" 
+        default="`${$idx == 2 ? (minKeepFilt ? 68 : 1024) :
+                    $idx == 3 ? (minKeepFilt ? 53 : 1024) :
+                                1024}`" visible="`${config$idx &amp;&amp; filter$idx_portnum}`" editable="`${config$idx_editable}`" desc="Either the single port to be filtered or the beginning of the block of contiguous numbers. When using a block, the starting port must be power of 2." />
+      <ParamRange id="filter$idx_end_port" name="Range" group="Packet Filter Configuration $idx" default="1023" min="0" max="65535" resolution="1" visible="`${config$idx &amp;&amp; (filter$idx_type eq CY_PF_PORT_BLOCK_FILTER)}`" editable="`${config$idx_editable}`" desc="Indicates the size of the block of port numbers, must be of the (2^y - 1) form and less than Port Number." />
     </Repeat>
 
     <ParamString id="numOfActiveFilters" name="NumOfContexts" group="Internal" default="`${(config0 ? 1 : 0) + (config1 ? 1 : 0) + (config2 ? 1 : 0) + (config3 ? 1 : 0) + (config4 ? 1 : 0) + (config5 ? 1 : 0) + (config6 ? 1 : 0) + (config7 ? 1 : 0) + (config8 ? 1 : 0) + (config9 ? 1 : 0) + (config10 ? 1 : 0) + (config11 ? 1 : 0) + (config12 ? 1 : 0) + (config13 ? 1 : 0) + (config14 ? 1 : 0) + (config15 ? 1 : 0) + (config16 ? 1 : 0) + (config17 ? 1 : 0) + (config18 ? 1 : 0) + (config19 ? 1 : 0) + (configTLS ? 1 : 0) + (configNonTLS ? 1 : 0)}`" visible="false" editable="false" desc="Number of active filter configurations." />
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/csd-2.0.cypersonality b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/csd-2.0.cypersonality
index 4fa791a5fb..cd5500b857 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/csd-2.0.cypersonality
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/csd-2.0.cypersonality
@@ -110,7 +110,7 @@
     <ParamBool id="CsdAdcEnable" name="Enable CSDADC" group="CSDADC" default="false" visible="true" editable="true" 
             desc="Enables the CSDADC function of the CSD hardware block. The CSD ADC middleware must be enabled in the Middleware Selector" />
     <ParamRange id="numChannels" name="Number of Input Channels" group="CSDADC" default="1" min="1" max="32" resolution="1" 
-            visible="`${CsdAdcEnable}`" editable="true" desc="The number of channels to scan" />
+            visible="`${CsdAdcEnable}`" editable="true" desc="The number of channels to scan. After changing the number, check the pins assignments of all enabled CSD features (CapSense, CSDADC, CSDIDAC)." />
     <ParamChoice id="resolution" name="Resolution" group="CSDADC" default="CY_CSDADC_RESOLUTION_10BIT" visible="`${CsdAdcEnable}`" editable="true" 
             desc="Configures the CSDADC resolution" >
       <Entry name="8 bit" value="CY_CSDADC_RESOLUTION_8BIT" visible="true" />
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/platform/power-1.2.cypersonality b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/platform/power-1.2.cypersonality
index 3e2ec0d373..c167619c24 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/platform/power-1.2.cypersonality
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/platform/power-1.2.cypersonality
@@ -40,11 +40,6 @@
     <!-- Documentation -->
     <ParamDoc id="pdlDoc" name="SysPm API Reference" group="Documentation" default="file:///`${cy_libs_path()}`/docs/pdl_api_reference_manual/html/group__group__syspm.html" linkText="Open SysPm Documentation" visible="true" desc="Opens the Peripheral Driver Library Documentation" />
 
-    <!-- Run power estimation external tool -->
-    <ParamCustom id="pwrEstimator" name="Power Estimator" group="External Tools" default="0" path="`${cy_tools_path(&quot;cype-tool&quot;) . &quot;/cype-tool&quot;}`" modal="false" visible="true" editable="true"
-      desc="Launch Power Estimator.">
-    </ParamCustom>
-
     <!-- Power settings -->
     <ParamChoice id="pwrMode" name="Power Mode" group="Internal" default="LDO_1_1" visible="false" editable="true"
       desc="This parameter was replaced by actPwrMode and coreRegulator.">
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/version.xml b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/version.xml
index 5cad2ba796..a50a525320 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/version.xml
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/version.xml
@@ -1 +1 @@
-<version>1.3.0.1324</version>
+<version>1.3.0.1362</version>