merge in lmp-release history after reset to 9c5564e060b019d154b07fca3513443039266145