MAGNETO-11874

MAGNETO-11874