[[ Bug 11628 ]] Prevent crash on Windows 7
Merge remote-tracking branch 'origin/bugfix-11628' into release-6.5.2