Merge "Fork AbstractResolverComparatorTest" into tm-qpr-dev