Replace mitigation with shielding
Merge pull request #716 from tzafrir/shielding

Replace mitigation with shielding