Bug 50 + Task 75
Task 81
Merge TFS Changeset 144