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

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