Merge branch '5.0.x' into 5.1.x