Synced the latest code from the TFS: changeset 1710 build 2629