Synced the latest code from the TFS: changeset 1759 build 2683