merge in lmp-release history after reset to 3ed00cbb947b6932ba7c999e1a96978e3b8f99c2