Merge "Add immune spaces abstraction" am: 31c0d484c1
am: 4eeea23e75

* commit '4eeea23e75b52873a2ea8f604543ae2d4e0dc259':
  Add immune spaces abstraction