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