Security and Stability 10389

Security First, Always 10346