Merge "Addressing APIs council feedback"