Bug Fixing
***NO_CI***
Merge TFS Changeset 1257