Merge pull request #1789 from wqyfavor/fix-rc-20

Fix rc 20