fix failing tests
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'