Merge "Add immune spaces abstraction"
am: 31c0d484c1

* commit '31c0d484c1f492909c4843c29c08c701f5b6eae9':
  Add immune spaces abstraction