Merge "Revert "Revert "Improve immune spaces logic"""