VP-91 Conditional validations - conditions and Conditional validator

refactoring