merge in lmp-mr1-release history after reset to 02542b3bbd6370e904e6bccba1032185b9f0eb75