merge in lmp-mr1-release history after reset to 9976480a6e7fc53b40f0fe97aac29aa297bfd1b7