[satfinder] merge from openvix