alignment with new spec final stage
Jira-issue: WP-1244