Fill in changes from gopher snakes

Cherry-pick the commits we want ?