https://nivaria.jira.com/browse/HPTPORTAL-570
https://nivaria.jira.com/browse/HPTPORTAL-567