Merge remote-tracking branch 'th/qs' into kitkat
Merge remote-tracking branch 'th/kitkat' into kitkat