merged from the mvo branch