API changes.
Resurrect
Merge in default
merge bug23378 into default