merge last changes from chino repo