[ETQR-067]

[ETQR-067]