Merge "More API updates."