Merge "Address further API review comments"