Umbraco - Overrides the default MacroContainerValueConverter, to return the correct type, HtmlString

MyMacroContainerValueConverter.cs

using System;
using Umbraco.Core;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.PropertyEditors.ValueConverters;
using Umbraco.Web.PropertyEditors.ValueConverters;

namespace Our.Umbraco.Web.HotFixes
{
    public class MyApplicationEventHandler : ApplicationEventHandler
    {
        protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
        {
            PropertyValueConvertersResolver.Current.RemoveType<MacroContainerValueConverter>();
        }
    }

    public class MyMacroContainerValueConverter : MacroContainerValueConverter
    {
        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
        {
            var value = base.ConvertDataToSource(propertyType, source, preview);
            return value != null ? new HtmlString(value.ToString()) : source;
        }
    }
}