merge in lmp-mr1-release history after reset to 8caf06fd90e877e6c0a4cc1e63bb5b5222704abe