[FRIN-116] FRIN-116