Make 3.0.x in sync with 3.2 here.