Merge fix from 3.2