[UTSU-618] UTSU-618