merge to trunk

git-tfs-id: [https://tfs.codeplex.com/tfs/TFS01]$/wsussmartapprove/main;C102152