Merge "Fix call to makeContent in SpecialChangeContentModel"