regression for 3.2
Merge branch '2.1' into 2.2