[ETQR-344]

[ETQR-344]