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

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