merge in lmp-release history after reset to 5e238a997176e0b6751dc27bf6eb09f2961d98f9