6.2.1-release checkpoint
Merge branch '6.2.1' into stable