[ETQR-343]

[ETQR-343]