treat empty strings as nulls to be consistent with cascading textdelimited scheme
merge from master