Merge fix from 3.0.x.