cleaning up rebase mess
Jira: WP-1226