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

* commit 'e90e8779581ddc5f2254173495ee52d5b070ed15':