API change
Merge default
Merged bug24114 into default