Merge with 6.0.1

src/Umbraco.Core/Models/ContentTypeBase.cs

@@ -347,6 +347,7 @@ namespace Umbraco.Core.Models
             if (PropertyTypeExists(propertyType.Alias) == false)
             {
                 _propertyTypes.Add(propertyType);
+                _propertyTypes.CollectionChanged += PropertyTypesChanged;
                 return true;
             }
 
@@ -378,9 +379,5 @@ namespace Umbraco.Core.Models
         {
             _parentId = id;
         }
-
-        //TODO Implement moving PropertyType between groups.
-        /*public bool MovePropertyTypeToGroup(string propertyTypeAlias, string groupName)
-        {}*/
     }
 }

src/Umbraco.Core/Models/ContentTypeCompositionBase.cs

@@ -93,6 +93,7 @@ namespace Umbraco.Core.Models
             {
                 var contentTypeComposition = ContentTypeComposition.First(x => x.Alias == alias);
                 RemovedContentTypeKeyTracker.Add(contentTypeComposition.Id);
+                OnPropertyChanged(ContentTypeCompositionSelector);
                 return _contentTypeComposition.Remove(contentTypeComposition);
             }
             return false;
@@ -154,6 +155,8 @@ namespace Umbraco.Core.Models
 
                     PropertyGroups.Add(propertyGroup);
                 }
+
+                return true;
             }
 
             return false;