Synced the latest code from the TFS: changeset 1671 build 2582