SC#QCADOOMESCLS-551 add and changed validators
SC#QCADOOMESCLS-551 add and changed validators
DF#QCADOOMESCLS-707
DF#QCADOOMESCLS-707