Synced the latest code from the TFS: changeset 1857 build 2818