Fix MAGN-3037 Port XyzAverage