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