[BMT-131] - Jira