API update.
merge default into bug23378
merge bug23378 into default