Merge with upstream (Fixed Bug #66987 Memory corruption in fileinfo ext)