merge in lmp-mr1-release history after reset to b50d0cd53f94b0c654e007464ec32396b0cb1aef