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