DELTASPIKE-426 fallback for full state-saving
DELTASPIKE-426 fallback for full state-saving