Synced the latest code from the TFS: changeset 1842 build 2792