https://nivaria.jira.com/browse/HPTPORTAL-616
https://nivaria.jira.com/browse/HPTPORTAL-577