feature #2453: add hostname configuration to context
Merge remote-tracking branch 'origin/feature-2453'