https://nivaria.jira.com/browse/COARCO-509  ( 1 )