Applied suggested patch for DIRMINA-990 and DIRMINA-991