merge in lmp-mr1-release history after reset to 6e93b246d41275ff55dfab2d747cf0d5c60b3652