[ETQR-321]

[ETQR-321]