Synced the latest code from the TFS: changeset 1932 build 2910