Upstream merge fix & do