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