[FRIN-119] FRIN-119