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