CRAFTERCMS-71: Managed this jira ticket.