Merge for Yuri