Merge "Revert "Improve immune spaces logic""
am: a48224f327

* commit 'a48224f32797b234f07d78fbbede5edbb212ceab':
  Revert "Improve immune spaces logic"