r1710 + initial Tainet import (ticket:138)