Merge "Address comments from API council"