Merge "Address API review from the council"