Update for 4.5.0.BUILD-SNAPSHOT development
Merge branch '4.x'