Introduce New Shielding Method
Merge remote-tracking branch 'origin/Shielding-Fix' into develop-future