DELTASPIKE-488 improved compatibility
DELTASPIKE-488 cleanup