Applied patch for DIRMINA-934