DELTASPIKE-338 first draft
DELTASPIKE-338 cleanup