Merge branch '2.4.x' into 2.5.x