https://nivaria.jira.com/browse/HPTPORTAL-610
https://nivaria.jira.com/browse/HPTPORTAL-581
https://nivaria.jira.com/browse/HPTPORTAL-591