Merge tag '2.11.1' into 2.11.x