MID-1993 implementation