[FRIN-117] FRIN-117