merge in lmp-mr1-release history after reset to 8e4dae587f8a4dd20b06c16e4f7fd3723ff56774