This is fixed in devel in changes that span multiple commits and this bit was omitted from the backport of those changes (which broke focal images)
This is fixed in devel in changes that span multiple commits and this bit was omitted from the backport of those changes (which broke focal images)