Merge branch 'develop'
Rechange to 1.65 release
Merge branch 'master' into develop
Rechange to 1.66-SNAPSHOT