Synced the latest code from the TFS: changeset 1657 build 2566