Merging TFS Updates

Merging in the updates made by Paragon in TFS.