merge in lmp-release history after reset to 13bfb5b232321b3b7a69bab2e99c323c68675da3