[merge history] [Guoqing]