API update
Merge bug26469