https://nivaria.jira.com/browse/HPTPORTAL-487
https://nivaria.jira.com/browse/HPTPORTAL-549