merge in lmp-mr1-release history after reset to 29a6e24d8e0f02177c42a1322de941758800a49d