Merge "Documentation based on API council feedback."