Change with Stability 2018

Protect What Matters 1696