https://brightvision.jira.com/browse/PLATFORM-2920