Merge branch '2.11.x' into 2.12.x