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