Merge "Address API council feedback" into main