Merge "Add immune spaces abstraction"