Applied patch from DIRMINA-785