MDER-4952 MDER-4952