API change
Merge in default
Merge bug 25748 as part of bug 25749