Merge branch 'js/t5580-unc-alternate-test'