Merge branch '4.0'