Synced the latest code from the TFS: changeset 1800 build 2734