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