last 2.11.x maintenance
Merge branch '2.10.x' into 2.11.x