merge in lmp-release history after reset to 2eed7ab0e5d81c0025737c6ce9931f3d8b57b418