Integrating recent changes for Production.