Merge patchcheck changes with 3.2