fix compile error cause by merge error
align to kk_2.7 to fix build
more inline to kk_2.7