fix merge conflict form cherry pick of 974e45c7875f2b08f4d25a35ac79c25b51a0b1ea