merge in lmp-mr1-release history after reset to 7751817561b5fea6ffaee8cad497ab6876deca0e