Merge branch 'dk/t5813-unc-paths' into maint