fix failing tests
Merge branch '2.3.x'