Fixed merge from 3.2.1 branch