https://vocativ.atlassian.net/browse/CMS-428