API performance enhancements (bug 13511):