[ETQR-510]

[ETQR-510]