Looks fine. We've already spun the release candidate for 9.12.0, so should
probably hold off on merging this, unless a respin turns out to be necessary
for other reasons.