merge in lmp-mr1-release history after reset to 9e042b547ac61eb259f28f49ca2d92a1629b9abc