[CUTE-645] CUTE-645