[ETQR-518]

[ETQR-518]