Merge "Add DomainSelectionResolver creation"