Synced the latest code from the TFS: changeset 1925 build 2903