Task 66 (partly)
Task 66 (part 3)
Merge TFS Changeset 152