Synced the latest code from the TFS: changeset 2123 build 3190