Sweeping !31400 from 21.3 to 21.9. Update diff_root_files to same version as in master
Update diff_root_files to same version as in master
See merge request !31400 (merged)
Update diff_root_files to same version as in master
See merge request !31400 (merged)