VP-91 Form class fixes
Merge pull request #13 from dlu-gs/feature/conditional-validations

VP-91 Form class fixes