Merge issue 1294232 patch from 3.2