merged from openvix