Merge "Address API Feedback" into lmp-dev