[ETQR-531]

[ETQR-531]