[FRIN-114] FRIN-114