Subtractive merge Changeset 116046. Spatially Aware Env volumes are currently causing compile errors on server builds