Merge branch '2769_compare_files_crash'