Merge branch '2.24.x' into 2.x