merge in lmp-release history after reset to d94854030c76fc4ee4126ca1707a76fbd1f29126