Fix previous commit && alot of backports from 3.15
Merge branch 'kitkat' into kitkat-test