merge in lmp-mr1-release history after reset to 5984fc03b6189f19f3721423b92469e4908a49ef