Merge pull request #3353 from Chuanbo-Weng:master