MAGNET-11872

MAGNET-11872