[BEAF-133] BEAF-133