merge in lmp-release history after reset to 3e8b79c2b3c84b2c6ef7b28903a719b10248e63d