merge in lmp-mr1-release history after reset to e754041a2071358eceb75fbf0b01703f63dca4ec