[ETQR-307]

[ETQR-307]