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