Synced the latest code from the TFS: changeset 1691 build 2608