merge in lmp-release history after reset to 8473faf6e834854591a9aa339d837a6560c7406b