Synced the latest code from the TFS: changeset 1686 build 2603