Update API
Merge bug25957 (again)