Synced the latest code from the TFS: changeset 1741 build 2663