[DPP-99] - JIRA