merge from apt--mvo