Synced the latest code from the TFS: changeset 1973 build 2956