Merge "Use ContextSource::getConfig instead of globals"