merge in lmp-mr1-release history after reset to c8e923a5e8025ab1666bf95308b35d9a94f7465e