Merge "Track API council feedback" into main