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