upstream merge fix