merge in lmp-mr1-release history after reset to 673ae4a4cd57d61f9558d2d45a62045e9024b2c3