Shields rebased

JeanMertz's shield updates rebased onto commit e9ced649ebc212cbb3e2d3485517d3fc3e3a1012