merge in lmp-release history after reset to 678792e362c4cd70640934049491d9f21560c63b