https://nivaria.jira.com/browse/HPTPORTAL-509
https://nivaria.jira.com/browse/HPTPORTAL-560