- Fix shield disabling being completely ignored (#10316)