Merge with upstream (Fixed bug #66307 Fileinfo crashes with powerpoint files)