Security and Stability 27048

Change with Stability 26861