Merge "API review fixes" into nyc-support-24.1-dev