https://nivaria.jira.com/browse/HPTPORTAL-579
https://nivaria.jira.com/browse/HPTPORTAL-586