Take the Future Back 21493

Stability for the Next Generation 21446