Merge "Address API review comments." into main