merge in lmp-release history after reset to 25a99ca2cafc79421799e364c8e6d688709c145b