Merged from coba-beta1