Fix valdiation strings
Merge remote-tracking branch 'origin/develop-hotFix' into develop