Merge branch 'ad/5580-unc-tests-on-cygwin' into maint