brings performance to the level of "migrates 2.10.x to 2.11.0-SNAPSHOT"