-Fixed/Resolved issue: 21477;
-Fixed/Resolved issue: 21477;

git-tfs-id: [https://tfs.codeplex.com:443/tfs/TFS02]$/alphafs/Development;C111141

modulexcite/AlphaFS,alphaleonis/AlphaFS,thomaslevesque/AlphaFS