Merge pull from HuaweiTech