merge in lmp-release history after reset to 0b6acb2231baed861488f2d181621272d0658d25