Merge "Update description based on API feedback"