JIRA Issue: FR-1939
JIRA Issue: FR-1939