[oUF] Upstream updates.