Merge remote-tracking branch 'origin/downloadtest' into debug-tests-more-single