diff --git a/applets/digital-clock/package/contents/ui/CalendarView.qml b/applets/digital-clock/package/contents/ui/CalendarView.qml
index 11f8f6f18..f38bd19bf 100644
--- a/applets/digital-clock/package/contents/ui/CalendarView.qml
+++ b/applets/digital-clock/package/contents/ui/CalendarView.qml
@@ -17,6 +17,7 @@
  */
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
+import QtQml 2.15
 
 import org.kde.kquickcontrolsaddons 2.0 // For kcmshell
 import org.kde.plasma.core 2.0 as PlasmaCore
@@ -246,6 +247,7 @@ PlasmaComponents3.Page {
                     target: plasmoid
                     property: "hideOnWindowDeactivate"
                     value: !plasmoid.configuration.pin
+                    restoreMode: Binding.RestoreBinding
                 }
 
                 TextMetrics {
diff --git a/applets/notifications/package/contents/ui/JobItem.qml b/applets/notifications/package/contents/ui/JobItem.qml
index bb25164cf..24302725d 100644
--- a/applets/notifications/package/contents/ui/JobItem.qml
+++ b/applets/notifications/package/contents/ui/JobItem.qml
@@ -21,6 +21,7 @@
 import QtQuick 2.8
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
+import QtQml 2.15
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 3.0 as PlasmaComponents3
@@ -88,6 +89,7 @@ ColumnLayout {
             property: "visible"
             value: true
             when: jobDragIcon.valid
+            restoreMode: Binding.RestoreBinding
         }
 
         DraggableFileArea {
diff --git a/applets/notifications/package/contents/ui/global/Globals.qml b/applets/notifications/package/contents/ui/global/Globals.qml
index d73f22d72..70b53836d 100644
--- a/applets/notifications/package/contents/ui/global/Globals.qml
+++ b/applets/notifications/package/contents/ui/global/Globals.qml
@@ -22,6 +22,7 @@ pragma Singleton
 import QtQuick 2.8
 import QtQuick.Window 2.12
 import QtQuick.Layouts 1.1
+import QtQml 2.15
 
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
@@ -647,6 +648,7 @@ QtObject {
         target: NotificationManager.Server
         property: "inhibited"
         value: globals.inhibited
+        restoreMode: Binding.RestoreBinding
     }
 
     function toggleDoNotDisturbMode() {
diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
index ed8e7ee6f..f871d0b81 100644
--- a/applets/notifications/package/contents/ui/main.qml
+++ b/applets/notifications/package/contents/ui/main.qml
@@ -19,6 +19,7 @@
  */
 
 import QtQuick 2.8
+import QtQml 2.15
 
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
@@ -148,6 +149,7 @@ Item {
         target: plasmoid.nativeInterface
         property: "dragPixmapSize"
         value: units.iconSizes.large
+        restoreMode: Binding.RestoreBinding
     }
 
     function closePassivePlasmoid() {
diff --git a/applets/systemmonitor/systemmonitor/package/contents/ui/CompactRepresentation.qml b/applets/systemmonitor/systemmonitor/package/contents/ui/CompactRepresentation.qml
index cf7d85773..982f85f9f 100644
--- a/applets/systemmonitor/systemmonitor/package/contents/ui/CompactRepresentation.qml
+++ b/applets/systemmonitor/systemmonitor/package/contents/ui/CompactRepresentation.qml
@@ -22,6 +22,8 @@
 import QtQuick 2.9
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.2
+import QtQml 2.15
+
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.quickcharts 1.0 as Charts
 
@@ -68,6 +70,7 @@ Control {
                 return Faces.SensorFace.Planar;
             }
         }
+        restoreMode: Binding.RestoreBinding
     }
 
     MouseArea {
diff --git a/applets/systemmonitor/systemmonitor/package/contents/ui/FullRepresentation.qml b/applets/systemmonitor/systemmonitor/package/contents/ui/FullRepresentation.qml
index 2fed088cb..f95226a2c 100644
--- a/applets/systemmonitor/systemmonitor/package/contents/ui/FullRepresentation.qml
+++ b/applets/systemmonitor/systemmonitor/package/contents/ui/FullRepresentation.qml
@@ -24,6 +24,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.2
 import QtQuick.Window 2.12
 import QtGraphicalEffects 1.0
+import QtQml 2.15
 
 import org.kde.kirigami 2.8 as Kirigami
 
@@ -70,6 +71,7 @@ Control {
                 return Faces.SensorFace.Planar;
             }
         }
+        restoreMode: Binding.RestoreBinding
     }
 }
 
diff --git a/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml b/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml
index de0858c99..89df4ce94 100644
--- a/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml
+++ b/applets/systemtray/package/contents/ui/items/PlasmoidItem.qml
@@ -18,6 +18,8 @@
  */
 
 import QtQuick 2.1
+import QtQml 2.15
+
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 AbstractItem {
@@ -93,5 +95,6 @@ AbstractItem {
         value: !plasmoid.configuration.pin
         target: plasmoidContainer.applet
         when: null !== plasmoidContainer.applet
+        restoreMode: Binding.RestoreBinding
     }
 }
diff --git a/kcms/colors/package/contents/ui/main.qml b/kcms/colors/package/contents/ui/main.qml
index b06a33977..4253458be 100644
--- a/kcms/colors/package/contents/ui/main.qml
+++ b/kcms/colors/package/contents/ui/main.qml
@@ -23,6 +23,8 @@ import QtQuick.Layouts 1.1
 import QtQuick.Window 2.2
 import QtQuick.Dialogs 1.0 as QtDialogs
 import QtQuick.Controls 2.3 as QtControls
+import QtQml 2.15
+
 import org.kde.kirigami 2.8 as Kirigami
 import org.kde.newstuff 1.62 as NewStuff
 import org.kde.kcm 1.3 as KCM
@@ -39,12 +41,14 @@ KCM.GridViewKCM {
         target: kcm.filteredModel
         property: "query"
         value: searchField.text
+        restoreMode: Binding.RestoreBinding
     }
 
     Binding {
         target: kcm.filteredModel
         property: "filter"
         value:  filterCombo.model[filterCombo.currentIndex].filter
+        restoreMode: Binding.RestoreBinding
     }
 
     KCM.SettingStateBinding {
diff --git a/kcms/desktoptheme/package/contents/ui/main.qml b/kcms/desktoptheme/package/contents/ui/main.qml
index 64c67d4c7..c7f37323d 100644
--- a/kcms/desktoptheme/package/contents/ui/main.qml
+++ b/kcms/desktoptheme/package/contents/ui/main.qml
@@ -23,6 +23,8 @@ import QtQuick 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0
 import QtQuick.Controls 2.3 as QtControls
+import QtQml 2.15
+
 import org.kde.kirigami 2.8 as Kirigami
 import org.kde.newstuff 1.62 as NewStuff
 import org.kde.kcm 1.3 as KCM
@@ -36,16 +38,18 @@ KCM.GridViewKCM {
     view.model: kcm.filteredModel
     view.currentIndex: kcm.filteredModel.selectedThemeIndex
 
-      Binding {
+    Binding {
         target: kcm.filteredModel
         property: "query"
         value: searchField.text
+        restoreMode: Binding.RestoreBinding
     }
 
     Binding {
         target: kcm.filteredModel
         property: "filter"
         value:  filterCombo.model[filterCombo.currentIndex].filter
+        restoreMode: Binding.RestoreBinding
     }
 
     KCM.SettingStateBinding {