[MAGEMEP-155] Fixed the validation of the attributes
Merge branch 'MAGEMEP-155' into development