Merge "BUG-2627: Fix ambiguous lookup in test case"