merge in lmp-release history after reset to 6319abc472e9661030c0925e5abbcab5a956e036