merge in lmp-release history after reset to aff4a27b96454d6868a7a22974f560147a13188f