Resolved merge conflict on eb752ac