https://nivaria.jira.com/browse/PCEG-339