Merge "Introduce `NoOpResolverComparator`." into main