[CUTE-467] CUTE-467