Fixed Bug 576
Merge TFS Changeset 1728