[ETQR-328]

[ETQR-328]