merge last updates from chino repo