[ETQR-338]

[ETQR-338]