Synced the latest code from the TFS: changeset 1683 build 2596