merge to trunk of marked for uninstall branch

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS01]$/wsussmartapprove/main;C107009
Merge commit 'b9039f65dd8368e109b49513de4785f31bb4e1ea'