Merge "Address api council feedback"