Fixed jira issues: FX-72, FX-73, FX-74