[ETQR-520]

[ETQR-520]