[ETQR-061]

[ETQR-061]