[ETQR-340]

[ETQR-340]