Merge branch '4.0.x'