> The below addition can be removed, it seems to be duplicate:
Indeed. I'm unsure how this got into the patch, probably some rebase mix-up. Attached v7 removes the duplicates.
-- Fabien.