DELTASPIKE-399 added hints
DELTASPIKE-399 default storage
DELTASPIKE-399 minor cleanup