Merge "Address API review" into lmp-dev