Update qe/prod/staging to latest kitchen sink