Synced the latest code from the TFS: changeset 1983 build 2968