Resolved merge conflict with core