* merged from apt--mvo