Stability Matters 8954

Change with Stability 8923