merge from chipleo