Prototype for DELTASPIKE-454
 DELTASPIKE-454 - refactored
possible NPE
DELTASPIKE-454 refactored initial redirect