merge in lmp-release history after reset to 4a97c3b307e3250bb5be002606ec14e14e89d5db