merge in lmp-release history after reset to cb093d1f55701da419d1013cc3e6fbb8aea3e957