Merge branch 'ar/test-cleanup-unused-file-creation-part2'