Merge "Adjust compat API based on API council feedback." into main