MAGMA-31732

MAGMA-31732