fix tests
Merge branch '3.2' into 3.3