Merge branch 'v8/8.14' into v8/8.15

# Conflicts:
#	src/SolutionInfo.cs

src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js

@@ -98,6 +98,10 @@
 
             vm.model.value.forEach(mediaEntry => updateMediaEntryData(mediaEntry));
 
+            // set the onValueChanged callback, this will tell us if the media picker model changed on the server
+            // once the data is submitted. If so we need to re-initialize
+            vm.model.onValueChanged = onServerValueChanged;
+
             userService.getCurrentUser().then(function (userData) {
 
                 if (!vm.model.config.startNodeId) {
@@ -120,6 +124,15 @@
 
         };
 
+        function onServerValueChanged(newVal, oldVal) {
+            if(newVal === null || !Array.isArray(newVal)) {
+                newVal = [];
+                vm.model.value = newVal;
+            }
+
+            vm.model.value.forEach(mediaEntry => updateMediaEntryData(mediaEntry));
+        }
+
         function setDirty() {
             if (vm.propertyForm) {
                 vm.propertyForm.$setDirty();

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -351,6 +351,9 @@
           <DevelopmentServerPort>8150</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:8150</IISUrl>
+          <DevelopmentServerPort>8141</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:8141</IISUrl>
           <DevelopmentServerPort>8131</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:8131</IISUrl>