Backport 3.2.8 changes.