Upstream updates merged