Synced the latest code from the TFS: changeset 1722 build 2642