[ETQR-322]

[ETQR-322]