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