[FRIN-108] FRIN-108