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