foreign/blackhole: updated to master