Fixed problem with UCM and Core Content Saving