[BEAF-129] BEAF-129