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