merge updates from chino repo