[AR-399] - Jira