Bionic: kitkat-grouper branch