Protecting What Matters Most 10618

Change with Stability 10598