DELTASPIKE-320 improved default handling