propagate API change; and some cosmetics
Merge bug25495