JIRA DEES-18 task (design)