Merge pull request #7065 from illume/upstream-windows-shell-lookup-0061