merge in lmp-release history after reset to 7a8991991f6459945782175b0cda7d03fbf6cbde