fix deep merge error with rbx
Merge pull request #753 from dspaeth-faber/fix_deep_merge

fix deep merge error with rbx
Validations refactor
Merge pull request #754 from oliverbarnes/validations-refactor

WIP validations refactor