> I noticed this patch didn't make it into 7.1-rc5. Is it still under
> review? If not, will it make it during the next merge window?

It is not a bugfix, so its time to go upstream is the next mergewindow.