align to kk_2.7 to fix build