Merging from branches/borui to branches/yummin