CMS-2499 Replace temporary content with draft content