merge in lmp-mr1-release history after reset to 71e9a7c4718f786c9d1bc5e6ab62d3f7d46dce66