Synced the latest code from the TFS: changeset 2235 build 3337