Rebase not properly done

Jira Issue: WP-263