Merge from isc-v6.0