Synced the latest code from the TFS: changeset 1652 build 2561