API change
Merged bug25778 into default