Master

Cherry-pick #571 from 3.3.x branch.