Merge "Bug 2362: Added pattern validation for string types."