Merge pull request #225 from ulsdevteam/add-date-validator-scoping