[oUF] More upstream updates.