JIRA Issue: FR-789
JIRA Issue: FR-789