[IDBD-713] IDBD-713