Merge branch 'v8/8.7' into v8/8.8

# Conflicts:
#	src/SolutionInfo.cs

src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less

@@ -19,7 +19,7 @@
         yeah so this is a pain, but we must be super specific in targeting the mandatory property labels,
         otherwise all properties within a reqired, nested, nested content property will all appear mandatory
     */
-    > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
+    .umb-property > ng-form > .control-group > .umb-el-wrap > .control-header label:after {
         content: '*';
         color: @red;
     }

src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js

@@ -138,10 +138,10 @@
 
             // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
             if (typeof newVal !== 'object' || newVal === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-                newVal = {};
+                vm.model.value = newVal = {};
             }
 
-            modelObject.update(newVal, $scope);
+            modelObject.update(vm.model.value, $scope);
             onLoaded();
         }