The regression fix in 4a808ed needs to be cherry-picked for maint-5.16. smoke-me/rjbs/maint-5.16 still fails on this. -- Reini Urban