Merge "Address API council feedback"