[oUF] Upstream update f939159..955f942