At some point, we'll just combine these multiple cherry-picks into a single merge commit when available upstream.