Synced the latest code from the TFS: changeset 1981 build 2966