Merge "Add v3 signature matching support during apex validation"