BDD: Update LegacyBundle and RestBundle for the inheritance fix