[BEAF-108] BEAF-108