Merge "Fix client usage in validation resources"