upstream imports r76