[ETQR-517]

[ETQR-517]