[BEAF-050] BEAF-050