Merge "Address the API review" into lmp-preview-dev