[ETQR-326]

[ETQR-326]