Build the Future 6497

Stability for the Next Generation 6084