[ETQR-308]

[ETQR-308]