merge in lmp-release history after reset to 4cb0499a5d6875fc13107f237779fb0422b4f7f2