Upstream merge fix