commit from guyu 13:56

ec4350fc1d527ad47967f291eec6b687453376b2
14:50 from gy