Upstream fixes r806