Merge "Refactor API syntax based on API council feedback. This is a noop." into main