[BEAF-063] BEAF-063