alignment with new specs
Jira-issue: HUBWMC-32