Update validations
Merge remote-tracking branch 'origin/fix_bugs' into develop-dummyApp