[FRIN-118] FRIN-118