Fixes valueExists validation
Merge branch 'master' into midway_odm
Merge branch 'master' into midway_odm