Update master branch with 6.2.0-rc1