Synced the latest code from the TFS: changeset 2134 build 3203