Merge "Improve immune spaces logic" am: d8e6d82adb
am: 93dab35231

* commit '93dab3523121ca2be3294dce33841912b4d6a1d1':
  Improve immune spaces logic