manually resolved merge conflicts
Jira: WP-1117