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