merge from openvix/master