merge in lmp-mr1-release history after reset to 7a28ce5ae3b261a6db50ed3e5bf4f58165ce4be6