https://nivaria.jira.com/browse/HPTPORTAL-557