merge in lmp-mr1-release history after reset to 701b96474dc8afd16046e440975e00be57cc4874