merge in lmp-release history after reset to c9fa8401b6fafd30ff2cf712cd08405431f119da