bring up to kitkat, merge in kk_2.7