Synced the latest code from the TFS: changeset 1998 build 2983