fix failing test
Merge branch '2.2.x'