Merge updates from the chino repo