Implement CMS PR 3293