Redmine #4638: Cleanups in file changes