merge in lmp-mr1-release history after reset to 106e582053121f1934c33a6c98d35377e8ae384a