Security and Stability 4692

Change with Stability 4606