XD-1429 Added shared server context to context hierarchy