merge in lmp-release history after reset to e8d8c97c5d213a0f88c7dbff9c1698651c9d0a75