merge with 3.2 branch