Synced the latest code from the TFS: changeset 2060 build 3081