Merged on 2.x branch.