Merge "API review feedback changes"