merge in lmp-release history after reset to 820dbff1b94d28b3c3570019df222179df29916f