Merge "update the SO APIs in the docs"