Merge remote-tracking branch 'art/kitkat' into kitkat-legacy