Merge branch 'hotfix/hotfix'
Validation fix
Merge branch 'hotfix/hotfix' into develop