Synced the latest code from the TFS: changeset 1632 build 2540