Hi, this is the second part of the patch sent in bug#52345, applied to
emacs-28 branch as requested by Eli.

Thanks&bye, lele.