[ETQR-342]

[ETQR-342]