resolved merge conflicts after cherry-pick