merge in lmp-mr1-release history after reset to 35fa26b61d9e44e961680dea9335dbc1f329b1bd