merge from openvix