EZP-20800: updated bundle  class