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