Merge "fix spatializer conversion" into main