This ticket is effectively a continuation of LU-13799, but I would prefer not to extend that ticket across multiple releases and add even more tickets to it.

These patches are similar but will be tracked separately.  (At least, that's my plan now.)