Merge pull request #3444 from swg0101/subjectvalidation