https://nivaria.jira.com/browse/NIVCICLOPROD-1125