Merge pull request !6445 from chenxiaobin/fixUpgrade7.0.0
The note is not visible to the blocked user.