Merge 17_cleanup_desktop_file.patch