Merge branch 'mk/t5562-do-not-reuse-output-files'