MID-2039 implementation