Synced the latest code from the TFS: changeset 1665 build 2576