Synced the latest code from the TFS: changeset 1970 build 2953