Synchronized with 6.2.x-develop and update tests
Prepare for 6.2.0-build-3 release
Prepare for development of 6.2.0-build-SNAPSHOT