EE front shielding (PR #5063 separated from PR #5061)

This is just Yana's pull request #5063.  That pull request also includes #5061 though so I've split them off so that they can be discussed separately.