Merge branch 'dev-v8' into temp8-U4-11219

src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using AutoMapper;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -50,17 +52,29 @@ namespace Umbraco.Web.Models.Mapping
             {
                 //a language Id needs to be set for a property type that can be varried by language
                 throw new InvalidOperationException($"No languageId found in mapping operation when one is required for the culture neutral property type {property.PropertyType.Alias}");
-            }
+            }
 
             var result = new TDestination
                 {
                     Id = property.Id,
-                    Value = editor.GetValueEditor().ToEditor(property, DataTypeService, languageId),
                     Alias = property.Alias,
                     PropertyEditor = editor,
                     Editor = editor.Alias
                 };
 
+            // if there's a set of property aliases specified, we will check if the current property's value should be mapped.
+            // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value.
+            if (context.Options.Items.ContainsKey("IncludeProperties"))
+            {
+                var includeProperties = context.Options.Items["IncludeProperties"] as IEnumerable<string>;
+                if (includeProperties != null && includeProperties.Contains(property.Alias) == false)
+                {
+                    return result;
+                }
+            }
+
+            // if no 'IncludeProperties' were specified or this property is set to be included - we will map the value and return.
+            result.Value = editor.GetValueEditor().ToEditor(property, DataTypeService, languageId);
             return result;
         }
     }