[BEAF-134] BEAF-134