merge in lmp-mr1-release history after reset to 81080625a239ae953ef355974e1da7d50389fbb6