Reimport from 3.2.x