commit by yy at 20140612