CDK-848: Update staging to latest changes.