Synced the latest code from the TFS: changeset 1935 build 2913