Patch included (created against the current emacs-28 branch, commit
9ff6999a060244c7726752f5cb07e8c8d1218f41)

-- 
Jan Synáček