Merge from Yaro