Merge remote-tracking branch 'upstream/master'
Move ResolvingEnsembleProvider to a new core module.