[BEAF-061] BEAF-061