Jira: AXMC-314