Merge "ContextSource::getContext() can return any IContextSource"