Aligned API with latest implementation fixes.

Jira-issue: API-26