CONN-1079 Added default to unlimited