Merge 3.x pre 3.12 release.