[ETQR-327]

[ETQR-327]