Merge "Update for API council feedback"