[BEAF-132] BEAF-132