JSEC-37 - architectural preparation to enable easy assumed identity support. Need to vet modifications before they can be verified as the final solution.