merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4656af3a8b11