Merge "Improve immune spaces logic"
am: d8e6d82adb

* commit 'd8e6d82adb9027bfa34958b22301a7d53142edad':
  Improve immune spaces logic