Merging minor fix for 3.2.x