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

* commit 'b0f8eb08015aee1750964212cd8dfccac274c40c':
  Add immune spaces abstraction