[FRIN-109] FRIN-109