merge in lmp-release history after reset to 3336652f22c3cfb5758213649ab4ac60302e82e7