Merge "Add new attributes to our notification" into lmp-dev